diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-12-07 14:12:17 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-12-07 14:12:17 -0500 |
| commit | 3fa9151f2610fdad23df02b2b914881286b22480 (patch) | |
| tree | ef9f91dfb3c886a59cc591739dc7ddb6f8a703a5 /src/or/control.c | |
| parent | cd4f56a37c3513cdca3463c3638067380af29219 (diff) | |
| parent | 4458fd0cd8fa259f0ee8195e1aa86d5b7c6f8919 (diff) | |
| download | tor-3fa9151f2610fdad23df02b2b914881286b22480.tar.gz tor-3fa9151f2610fdad23df02b2b914881286b22480.zip | |
Merge branch 'win64-7260'
Conflicts:
src/or/dns.c
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 d935265d00..75c9af6f7b 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1221,7 +1221,8 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len, connection_mark_for_close(TO_CONN(conn)); return 0; ok: - log_info(LD_CONTROL, "Authenticated control connection (%d)", conn->base_.s); + log_info(LD_CONTROL, "Authenticated control connection ("TOR_SOCKET_T_FORMAT + ")", conn->base_.s); send_control_done(conn); conn->base_.state = CONTROL_CONN_STATE_OPEN; tor_free(password); |