[tor-commits] [torspec/master] 285: fix up some of the simpler issues