[tor-commits] [torspec/master] substantive changes that i hope aren't controversial

[arma at torproject.org]

commit 80d95af2c9e1e44d512c7247d8940cdf93d57651
Author: Roger Dingledine <arma at torproject.org>
Date:   Sun May 8 21:01:44 2016 -0400

    substantive changes that i hope aren't controversial
---
 proposals/224-rend-spec-ng.txt | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt
index d732b27..8bcd9f8 100644
--- a/proposals/224-rend-spec-ng.txt
+++ b/proposals/224-rend-spec-ng.txt
@@ -205,20 +205,20 @@ Status: Draft
 
       35 -- RELAY_COMMAND_INTRODUCE2
 
-            Sent from client to introduction point; requests
+            Sent from introduction point to hidden service host; requests
             introduction. Same format as INTRODUCE1. Discussed in
             [FMT_INTRO1] and [PROCESS_INTRO2]
 
       36 -- RELAY_COMMAND_RENDEZVOUS1
 
-            Sent from introduction point to rendezvous point;
-            attempts to join introduction point's circuit to
+            Sent from hidden service host to rendezvous point;
+            attempts to join host's circuit to
             client's circuit. Discussed in [JOIN_REND]
 
       37 -- RELAY_COMMAND_RENDEZVOUS2
 
-            Sent from introduction point to rendezvous point;
-            reports join of introduction point's circuit to
+            Sent from rendezvous point to client;
+            reports join of host's circuit to
             client's circuit. Discussed in [JOIN_REND]
 
       38 -- RELAY_COMMAND_INTRO_ESTABLISHED
@@ -711,8 +711,8 @@ Status: Draft
    host uploads descriptors to the first hsdir_spread_store nodes whose
    indices immediately follow hs_index(replicanum). If any of those
    nodes have already been selected for a lower-numbered replica of the
-   service, any nodes already chosen are disregarded when choosing a
-   replica's hsdir_spread_store nodes.
+   service, any nodes already chosen are disregarded (i.e. skipped over)
+   when choosing a replica's hsdir_spread_store nodes.
 
    [ XX/teor - because the positions don't match the key, this might leak
      the fact that nodes from other replicas are nearby to a HSDir.
@@ -1112,6 +1112,8 @@ Status: Draft
    authentication keys. Newer hidden services MAY use RSA keys up 1904
    bits. Any more than that will not fit in a RELAY cell payload.
 
+[There is no 3.1.3?]
+
 3.1.4. Acknowledging establishment of introduction point [INTRO_ESTABLISHED]
 
    After setting up an introduction circuit, the introduction point reports its