[tor-commits] [community/master] Merge branch 'gsoc-captcha'