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