[tor-commits] [tor/master] Fix unit tests to pass after fix for #8879