[tor-commits] [tor/master] Merge branch 'pr_1643_squashed'