[tor-commits] [torspec/master] Merge remote-tracking branch 'tomrittervg/control-spec-editorial-1'