[tor-commits] [tor/master] grandfather in two more functions