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