[tor-commits] [tor/master] remove two unused test_* macros