[tor-commits] [tor] 01/02: Merge branch 'maint-0.4.7' into release-0.4.7