[tor-commits] [torspec/master] Correct description of which cells are allowed during the handshake

[nickm at torproject.org]

commit 1bbf52873ca7d585f36596ae67bc61d49105af12
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 6 13:45:16 2017 -0400

    Correct description of which cells are allowed during the handshake
    
    We said that PADDING was allowed, but it wasn't.
    
    Bug 22934.
---
 tor-spec.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tor-spec.txt b/tor-spec.txt
index 176dfc1..600d457 100644
--- a/tor-spec.txt
+++ b/tor-spec.txt
@@ -504,9 +504,9 @@ see tor-design.pdf.
    authenticate or not. If it does not want to authenticate, it MUST
    send a NETINFO cell.  If it does want to authenticate, it MUST send a
    CERTS cell, an AUTHENTICATE cell (4.4), and a NETINFO.  When this
-   handshake is in use, the first cell must be VERSIONS, VPADDING or
+   handshake is in use, the first cell must be VERSIONS, VPADDING, or
    AUTHORIZE, and no other cell type is allowed to intervene besides
-   those specified, except for PADDING and VPADDING cells.
+   those specified, except for VPADDING cells.
 
    The AUTHORIZE cell type is reserved for future use by scanning-resistance
    designs.