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