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