[tor-commits] [torspec/master] other easier fixes to prop#280