[tor-commits] [tor/master] Fix test naming, and fix tests on windows.