aboutsummaryrefslogtreecommitdiff
path: root/control-spec.txt
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-01-28 12:06:49 -0500
committerNick Mathewson <nickm@torproject.org>2015-01-28 12:06:49 -0500
commit29759745fe1a3a216af7eb9e7ddfa20a10e60f47 (patch)
treea87644724e8fa154f208b668b1afaee650e6fb91 /control-spec.txt
parentddfd56998e75a9a789999d418015b7c9db7df43e (diff)
downloadtorspec-29759745fe1a3a216af7eb9e7ddfa20a10e60f47.tar.gz
torspec-29759745fe1a3a216af7eb9e7ddfa20a10e60f47.zip
Add #8405 changes to control-spec
Diffstat (limited to 'control-spec.txt')
-rw-r--r--control-spec.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/control-spec.txt b/control-spec.txt
index 1950b44..e4c98f5 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -1318,7 +1318,10 @@
[SP "BUILD_FLAGS=" BuildFlags] [SP "PURPOSE=" Purpose]
[SP "HS_STATE=" HSState] [SP "REND_QUERY=" HSAddress]
[SP "TIME_CREATED=" TimeCreated]
- [SP "REASON=" Reason [SP "REMOTE_REASON=" Reason]] CRLF
+ [SP "REASON=" Reason [SP "REMOTE_REASON=" Reason]]
+ [SP "SOCKS_USERNAME=" EscapedUsername]
+ [SP "SOCKS_PASSWORD=" EscapedPassword]
+ CRLF
CircStatus =
"LAUNCHED" / ; circuit ID assigned to new circuit
@@ -1347,6 +1350,8 @@
"HSSI_CONNECTING" / "HSSI_ESTABLISHED" /
"HSSR_CONNECTING" / "HSSR_JOINED"
+ SocksUsername = SocksPassword = a quoted string
+
HSAddress = 16*Base32Character
Base32Character = ALPHA / "2" / "3" / "4" / "5" / "6" / "7"