[tor-commits] [tor/master] Fix a couple of routerstatus-based tests.