[tor-commits] [tor/release-0.4.6] Merge branch 'bug40175_045' into maint-0.4.6