backport candidate:

Make it possible to read the PROTOCOLINFO response in a way that
conforms to our control-spec. Reported by Matt Edman.


svn:r11251

ChangeLog

@@ -24,6 +24,8 @@ Changes in version 0.2.0.6-alpha - 2007-??-??
     - Stop putting the authentication cookie in a file called "0"
       in your working directory if you don't specify anything for the
       new CookieAuthFile option. Reported by Matt Edman.
+    - Make it possible to read the PROTOCOLINFO response in a way that
+      conforms to our control-spec. Reported by Matt Edman.
     - Fix a minor memory leak when we fail to find enough suitable
       servers to choose a circuit. Bugfix on 0.1.2.x.
     - Stop leaking part of the descriptor when we run into a particularly

doc/spec/control-spec.txt

@@ -741,7 +741,7 @@ $Id$
     "PROTOCOLINFO" *(SP PIVERSION) CRLF
 
   The server reply format is:
-    "250+PROTOCOLINFO" SP PIVERSION CRLF *InfoLine "250 OK" CRLF
+    "250-PROTOCOLINFO" SP PIVERSION CRLF *InfoLine "250 OK" CRLF
 
     InfoLine = AuthLine / VersionLine / OtherLine
 

src/or/control.c

@@ -2321,7 +2321,7 @@ handle_control_protocolinfo(control_connection_t *conn, uint32_t len,
     }
 
     connection_printf_to_buf(conn,
-                             "250+PROTOCOLINFO 1\r\n"
+                             "250-PROTOCOLINFO 1\r\n"
                              "250-AUTH METHODS=%s%s%s\r\n"
                              "250-VERSION Tor=%s\r\n"
                              "250 OK\r\n",