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