diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-07-07 12:42:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-07-07 12:42:24 -0400 |
| commit | aa0cf31c5184b3c7bba428a531c9f9632f2cf072 (patch) | |
| tree | 29ff411277ccb88d524627329f526086097972e3 /src/or | |
| parent | 4d6af73db88e409764f43fc6cdaa432d667becf3 (diff) | |
| parent | d996b7463e8228dd6b08a28bc42cee61eeff910c (diff) | |
| download | tor-aa0cf31c5184b3c7bba428a531c9f9632f2cf072.tar.gz tor-aa0cf31c5184b3c7bba428a531c9f9632f2cf072.zip | |
Merge commit 'origin/maint-0.2.1'
Conflicts:
ChangeLog
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/connection_edge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index dd44190c71..560a2433d7 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1486,7 +1486,8 @@ connection_ap_handshake_rewrite_and_attach(edge_connection_t *conn, addresstype = parse_extended_hostname(socks->address); if (addresstype == BAD_HOSTNAME) { - log_warn(LD_APP, "Invalid hostname %s; rejecting", socks->address); + log_warn(LD_APP, "Invalid onion hostname %s; rejecting", + safe_str(socks->address)); control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s", escaped(socks->address)); connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL); |