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