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