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/dns.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/dns.c')
| -rw-r--r-- | src/or/dns.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/dns.c b/src/or/dns.c index 963039df44..7d9c2d4159 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -847,7 +847,8 @@ connection_dns_remove(edge_connection_t *conn) tor_free(pend); log_debug(LD_EXIT, "First connection (fd %d) no longer waiting " "for resolve of %s", - conn->_base.s, escaped_safe_str(conn->_base.address)); + conn->_base.s, + escaped_safe_str(conn->_base.address)); return; } else { for ( ; pend->next; pend = pend->next) { @@ -1387,7 +1388,8 @@ launch_resolve(edge_connection_t *exitconn) r = 0; if (!req) { - log_warn(LD_EXIT, "eventdns rejected address %s.", escaped_safe_str(addr)); + log_warn(LD_EXIT, "eventdns rejected address %s.", + escaped_safe_str(addr)); r = -1; tor_free(addr); /* There is no evdns request in progress; stop * addr from getting leaked. */ |