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