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/buffers.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/buffers.c')
-rw-r--r-- | src/or/buffers.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index 7c40e47cca..c990b6619a 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1495,7 +1495,8 @@ fetch_from_buf_socks(buf_t *buf, socks_request_t *req, return -1; } log_debug(LD_APP, - "socks4: successfully read destip (%s)", safe_str(tmpbuf)); + "socks4: successfully read destip (%s)", + safe_str_client(tmpbuf)); socks4_prot = socks4; } |