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