[tor-commits] [tor/master] Merge branch 'ticket34382' into maint-0.4.4