[tor-commits] [tor] 07/13: Merge branch 'maint-0.4.6' into maint-0.4.7