[tor-commits] [tor/master] Merge branch 'bug7947' into maint-0.2.4