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