commit 19df037e53331ae528b876f225be08f198e0f8b6 Author: Andreas Stieger astieger@suse.com Date: Mon Aug 24 01:04:44 2015 +0200

Log malformed hostnames in socks5 request respecting SafeLogging --- changes/malformed-hostname-safe-logging | 3 +++ src/or/buffers.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/malformed-hostname-safe-logging b/changes/malformed-hostname-safe-logging new file mode 100644 index 0000000..9300726 --- /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 2d7dd93..85fcbc6 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)