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