[tor-commits] [tor/release-0.4.2] Merge branch 'bug34077_041' into maint-0.4.1