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