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