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