commit 608c4a2b8be043a840c64b6f59f5cbfa48fae33b Merge: 54ef5f2 46bc41b Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 30 10:10:53 2018 -0400

Merge branch '26228-padding-bytes_squashed'

tor-spec.txt | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-)

diff --cc tor-spec.txt index 02bb9ae,114d13c..4cc38b3 --- a/tor-spec.txt +++ b/tor-spec.txt @@@ -468,9 -471,10 +472,10 @@@ see tor-design.pdf 132 -- AUTHORIZE (Client authorization) (Not yet used)

The interpretation of 'Payload' depends on the type of the cell. - PADDING: Payload is unused. + VPADDING/PADDING: + Payload contains padding bytes. - CREATE: Payload contains the handshake challenge. - CREATED: Payload contains the handshake response. + CREATE/CREATE2: Payload contains the handshake challenge. + CREATED/CREATED2: Payload contains the handshake response. RELAY: Payload contains the relay header and relay body. DESTROY: Payload contains a reason for closing the circuit. (see 5.4)