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