[tor-commits] [tor/master] final cleanups