[tor-commits] [torspec/master] Fix typos and thinkos in prop264. Closes 20577. Thanks, teor!

[nickm at torproject.org]

commit 113ea308036f54e7a03d7a0fd0aaed3263bd42b8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Nov 6 20:30:20 2016 -0500

    Fix typos and thinkos in prop264. Closes 20577. Thanks, teor!
---
 proposals/224-rend-spec-ng.txt         |  4 ++--
 proposals/264-subprotocol-versions.txt | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt
index 1fe738d..9c4527e 100644
--- a/proposals/224-rend-spec-ng.txt
+++ b/proposals/224-rend-spec-ng.txt
@@ -1755,8 +1755,8 @@ Appendix A. Signature scheme with key blinding [KEYBLIND]
 
   Let the basepoint be written as B. Assume B has prime order l, so
   lB=0. Let a master keypair be written as (a,A), where a is the private
-  key and A is the public key (A=aB).
-
+  key and A is the public key (A=aB)
+.
   To derive the key for a nonce N and an optional secret s, compute the
   blinding factor h as H(A | s, B, N), and let:
 
diff --git a/proposals/264-subprotocol-versions.txt b/proposals/264-subprotocol-versions.txt
index 8bf1718..5990ef8 100644
--- a/proposals/264-subprotocol-versions.txt
+++ b/proposals/264-subprotocol-versions.txt
@@ -194,7 +194,8 @@ Implemented-In: 0.2.9.4-alpha
    The "relay" protocols are those used to handle CREATE cells, and
    those that handle the various RELAY cell types received after a
    CREATE cell.  (Except, relay cells used to manage introduction and
-   rendezvous points are managed with the "HSMid" protocols.)
+   rendezvous points are managed with the "HSIntro" and "HSRend" protocols
+   respectively.)
 
       "1" -- supports the TAP key exchange, with all features in Tor
          0.2.3.  Support for CREATE and CREATED and CREATE_FAST and
@@ -226,7 +227,7 @@ Implemented-In: 0.2.9.4-alpha
    that can be uploaded to, understood by, and downloaded from a tor
    relay, and the set of URLs available to fetch them.
 
-      "2" -- supports all features in Tor 0.2.0.10-alpha.
+      "1" -- supports all features in Tor 0.2.0.10-alpha.
 
 5.7. "DirCache"
 
@@ -308,7 +309,8 @@ A.1.  Inferring missing proto lines.
    Tor earlier than 0.2.4.19, so that we can have the protocol list for
    all current Tor versions include:
 
-      DirCache=1 HSDir=1 HSMid=1 Link=1-4 LinkAuth=1 Relay=1-2
+     Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1-2 Link=1-4
+     LinkAuth=1 Microdesc=1-2 Relay=1-2
 
    For Desc, Tor versions before 0.2.7.stable should be taken to have
    Desc=1 and versions 0.2.7.stable or later should have Desc=1-2.
@@ -377,7 +379,7 @@ A.3. Example integration with other open proposals
     189  AUTHORIZE and AUTHORIZED cells
 
          This would be a new protocol, either a Link protocol or a new
-         LinkAuthz protocol.
+         LinkAuth protocol.
 
     191  Bridge Detection Resistance against MITM-capable Adversaries
 
@@ -431,7 +433,7 @@ A.3. Example integration with other open proposals
 
     224  Next-Generation Hidden Services in Tor
 
-         Adds new HSDir and HSMid protocols.
+         Adds new HSDir and HSIntro and HSRend protocols.
 
     226 "Scalability and Stability Improvements to BridgeDB: Switching
          to a Distributed Database System and RDBMS"
@@ -474,7 +476,7 @@ A.3. Example integration with other open proposals
 
     246  Merging Hidden Service Directories and Introduction Points
 
-         Possibly adds a new HSMid protocol.
+         Possibly adds a new HSIntro or HSDir protocol.
 
     247  Defending Against Guard Discovery Attacks using Vanguards