[tor-commits] [tor] 03/03: Merge branch 'maint-0.4.6'