summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/malformed-hostname-safe-logging3
-rw-r--r--src/or/buffers.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/malformed-hostname-safe-logging b/changes/malformed-hostname-safe-logging
new file mode 100644
index 0000000000..93007265e9
--- /dev/null
+++ b/changes/malformed-hostname-safe-logging
@@ -0,0 +1,3 @@
+ o Minor bugfixes:
+ - When logging malformed hostnames in socks5 requests, respect
+ SafeLogging configuration
diff --git a/src/or/buffers.c b/src/or/buffers.c
index 2d7dd937d8..85fcbc64e8 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1842,7 +1842,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req,
log_warn(LD_PROTOCOL,
"Your application (using socks5 to port %d) gave Tor "
"a malformed hostname: %s. Rejecting the connection.",
- req->port, escaped(req->address));
+ req->port, escaped_safe_str_client(req->address));
return -1;
}
if (log_sockstype)