diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-12-15 17:26:09 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-12-15 17:26:09 -0500 |
| commit | 350181529e39c5b9dcec7f1ae7edf15946fee501 (patch) | |
| tree | e6d9f2c537db3f03c0a3d9791b178dae5f1b7782 /src/or/circuitlist.c | |
| parent | 616cbb31c72a95408d018fd937f1bf3adf886a9f (diff) | |
| parent | fcbd65b45cbf203b00e6752dabc7bc5b8dffdbcf (diff) | |
| download | tor-350181529e39c5b9dcec7f1ae7edf15946fee501.tar.gz tor-350181529e39c5b9dcec7f1ae7edf15946fee501.zip | |
Merge branch 'safelogging2'
Conflicts:
ChangeLog
Diffstat (limited to 'src/or/circuitlist.c')
| -rw-r--r-- | src/or/circuitlist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 2c949def00..83cb75ea9f 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1080,9 +1080,9 @@ _circuit_mark_for_close(circuit_t *circ, int reason, int line, tor_assert(ocirc->rend_data); /* treat this like getting a nack from it */ log_info(LD_REND, "Failed intro circ %s to %s (awaiting ack). " - "Removing from descriptor.", - safe_str(ocirc->rend_data->onion_address), - safe_str(build_state_get_exit_nickname(ocirc->build_state))); + "Removing from descriptor.", + safe_str_client(ocirc->rend_data->onion_address), + safe_str_client(build_state_get_exit_nickname(ocirc->build_state))); rend_client_remove_intro_point(ocirc->build_state->chosen_exit, ocirc->rend_data); } |