[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/50'

[nickm at torproject.org]

commit 8bc330e355a494521d22a36e1aa06bf9c53e3c9c
Merge: 32002ec 4af0ad4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 25 13:34:44 2019 -0500

    Merge remote-tracking branch 'tor-github/pr/50'

 control-spec.txt | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 108 insertions(+), 11 deletions(-)

diff --cc control-spec.txt
index 87d4414,faaf160..78a842f
--- a/control-spec.txt
+++ b/control-spec.txt
@@@ -3651,10 -3682,18 +3738,18 @@@
    tag=ap_handshake summary="Finishing handshake with a relay to build circuits"
   [New in 0.4.0.x]
  
+   This is similar to handshake, except for making connections to
+   additional relays or bridges that Tor needs to use to build
+   application circuits.
+ 
    Phase 90:
 -  tag=ap_handshake_done summary="Handshake fininshed with a relay to build circuits"
 +  tag=ap_handshake_done summary="Handshake finished with a relay to build circuits"
   [New in 0.4.0.x]
  
+   This is similar to handshake_done, except for making connections to
+   additional relays or bridges that Tor needs to use to build
+   application circuits.
+ 
    Phase 95:
    tag=circuit_create summary="Establishing a[n internal] Tor circuit"
   [prior to 0.4.0.x, this was numbered 90]