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