[tor-commits] [tor/master] Make unit tests run again. Fix bug 4606.