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