[tor-commits] [manual/develop] Merge branch 'replace-captcha'