[tor-commits] [tor/maint-0.2.3] Fix some problems with the bug9002 fix.