[tor-commits] [torspec/master] Tighten up some terms and phrasing.