[tor-commits] [tor] 03/06: Merge branch 'maint-0.4.7' into release-0.4.7