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