[tor-commits] [tor] 08/08: Merge branch 'maint-0.4.7'