[tor-commits] [tor/master] cleanup and ask two questions for nick