[tor-commits] [tor/master] Fix compilation from 2841 branch