[tor-commits] [torspec/master] Nick Hopper changes