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