diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-03-26 18:51:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-03-26 18:51:37 -0400 |
| commit | 5a2d0fbe64eda754a87ec35cfbd5d49c91ebc4b2 (patch) | |
| tree | 1a5096affb2660985bee8e5486018fdee35c08c2 /src/or/or.h | |
| parent | f5c59eb28a82b5dbdf9e08955cd6129e8b824c4e (diff) | |
| parent | 9740f067c4bed47beb63483be4f4636167a04019 (diff) | |
| download | tor-5a2d0fbe64eda754a87ec35cfbd5d49c91ebc4b2.tar.gz tor-5a2d0fbe64eda754a87ec35cfbd5d49c91ebc4b2.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/control.c
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 33324f50b5..4996fd33af 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1464,6 +1464,12 @@ typedef struct control_connection_t { * connection. */ unsigned int is_owning_control_connection:1; + /** If we have sent an AUTHCHALLENGE reply on this connection and + * have not received a successful AUTHENTICATE command, points to + * the value which the client must send to authenticate itself; + * otherwise, NULL. */ + char *safecookie_client_hash; + /** Amount of space allocated in incoming_cmd. */ uint32_t incoming_cmd_len; /** Number of bytes currently stored in incoming_cmd. */ |