[tor-commits] [tor/master] Remove now-unused helper functions