[tor-commits] [tor/release-0.2.4] Fix some problems with the bug9002 fix.