[tor-commits] [tor] 05/06: Merge branch 'maint-0.4.6' into maint-0.4.7