diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-23 10:03:14 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-23 10:03:14 -0500 |
| commit | a7290cc82d814daec50d01a7693adc45afac3ef0 (patch) | |
| tree | 8c8fa8ff842a9f69905c12ba8d9872bdbe66ceac /control-spec.txt | |
| parent | 77e3a4314905c3f14469eec784e955d9dd72e2c0 (diff) | |
| parent | 01e7cb79bf3877d2c3e2d8f4f46a0a8bdfadbddf (diff) | |
| download | torspec-a7290cc82d814daec50d01a7693adc45afac3ef0.tar.gz torspec-a7290cc82d814daec50d01a7693adc45afac3ef0.zip | |
Merge remote-tracking branch 'arthuredelstein/14555+'
Diffstat (limited to 'control-spec.txt')
| -rw-r--r-- | control-spec.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/control-spec.txt b/control-spec.txt index d780dbb..d8d3dcd 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1358,7 +1358,8 @@ "HSSI_CONNECTING" / "HSSI_ESTABLISHED" / "HSSR_CONNECTING" / "HSSR_JOINED" - SocksUsername = SocksPassword = a quoted string + EscapedUsername = QuotedString + EscapedPassword = QuotedString HSAddress = 16*Base32Character Base32Character = ALPHA / "2" / "3" / "4" / "5" / "6" / "7" @@ -1423,6 +1424,15 @@ HSSR_CONNECTING (connecting to client's rend point) HSSR_JOINED (connected to client's RP circuit) + The "SOCKS_USERNAME" and "SOCKS_PASSWORD" fields indicate the credentials + that were used by a SOCKS client to connect to Tor's SOCKS port and + initiate this circuit. Special characters sent by the SOCKS client are + escaped, namely \\, \", \', \r, \n, \t, and byte values > 127 printed as + octal values, such as \377 for character 255. (Streams for SOCKS clients + connected with different usernames and/or passwords are isolated on + separate circuits if the IsolateSOCKSAuth flag is active; see Proposal + 171.) + The "REND_QUERY" field is provided only for hidden-service-related circuits, and only in versions 0.2.3.11-alpha and later. Clients MUST accept hidden service addresses in formats other than that |