diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-02-29 01:45:06 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-02-29 01:45:06 +0000 |
| commit | c5a7ff8e4343886b2d4a5afb7d16d772c664a409 (patch) | |
| tree | 723a99f825f514b20623cb67b0db0cbfbf761a85 /src/or/control.c | |
| parent | 04efc74e18fd79af337dcbc2ee5631184601e5a5 (diff) | |
| download | tor-c5a7ff8e4343886b2d4a5afb7d16d772c664a409.tar.gz tor-c5a7ff8e4343886b2d4a5afb7d16d772c664a409.zip | |
forward-port r13777
svn:r13778
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c index fb4af9112b..3cc9c5fe2f 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2541,7 +2541,8 @@ handle_control_protocolinfo(control_connection_t *conn, uint32_t len, char *esc_cfile = esc_for_log(cfile); char *methods; { - int passwd = (options->HashedControlPassword != NULL); + int passwd = (options->HashedControlPassword != NULL || + options->HashedControlSessionPassword != NULL); smartlist_t *mlist = smartlist_create(); if (cookies) smartlist_add(mlist, (char*)"COOKIE"); |