commit 29759745fe1a3a216af7eb9e7ddfa20a10e60f47 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 28 12:06:49 2015 -0500 Add #8405 changes to control-spec --- control-spec.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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"