[tor-commits] [torspec/master] Merge remote-tracking branch 'rransom-tor/feature3457-v2'

[nickm at torproject.org]

commit e398656414e62cca601eecc44fd44a027f594efb
Merge: af99cd5 ca3f983
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 11 12:13:15 2012 -0500

    Merge remote-tracking branch 'rransom-tor/feature3457-v2'
    
    Conflicts:
    	control-spec.txt

 control-spec.txt |   38 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 insertions(+), 1 deletions(-)

diff --cc control-spec.txt
index cce9390,36b6816..27dfa07
--- a/control-spec.txt
+++ b/control-spec.txt
@@@ -1976,19 -1919,31 +1987,44 @@@
  
    [First added in 0.2.3.1-alpha]
  
 -4.1.18. Circuit status changed slightly
 +4.1.18. Configuration changed
 +
 +  The syntax is:
 +     StartReplyLine *(MidReplyLine) EndReplyLine
 +
 +     StartReplyLine = "650-CONF_CHANGED" CRLF
 +     MidReplyLine = "650-" KEYWORD ["=" VALUE] CRLF
 +     EndReplyLine = "650 OK"
 +
 +  Tor configuration options have changed (such as via a SETCONF or RELOAD
 +  signal). KEYWORD and VALUE specify the configuration option that was changed.
 +  Undefined configuration options contain only the KEYWORD.
 +
++4.1.19. Circuit status changed slightly
+ 
+   The syntax is:
+ 
 -    "650" SP "CIRC2" SP CircuitID SP CircEvent [SP Path]
++    "650" SP "CIRC_MINOR" SP CircuitID SP CircEvent [SP Path]
+           [SP "BUILD_FLAGS=" BuildFlags] [SP "PURPOSE=" Purpose]
+           [SP "HS_STATE=" HSState] [SP "REND_QUERY=" HSAddress]
+           [SP "TIME_CREATED=" TimeCreated]
+           [SP "OLD_PURPOSE=" Purpose [SP "OLD_HS_STATE=" HSState]] CRLF
+ 
+     CircEvent =
+              "PURPOSE_CHANGED" / ; circuit purpose or HS-related state changed
+              "CANNIBALIZED"      ; circuit cannibalized
+ 
+   Clients MUST accept circuit events not listed above.
+ 
+   The "OLD_PURPOSE" field is provided for both PURPOSE_CHANGED and
+   CANNIBALIZED events.  The "OLD_HS_STATE" field is provided whenever
+   the "OLD_PURPOSE" field is provided and is a hidden-service-related
+   purpose.
+ 
+   Other fields are as specified in section 4.1.1 above.
+ 
+   [First added in 0.2.3.2-alpha]
+ 
  5. Implementation notes
  
  5.1. Authentication