[tor-commits] [torspec/master] some more cleanups