[tor-commits] [tor/master] Fix unearthed problems in unit tests