nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.2'

Browse Source
This commit is contained in:
Nick Mathewson 2017-11-17 08:35:04 -05:00
commit 4ef70ff389
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket24097 Normal file
View File

@ -0,0 +1,4 @@
o Minor features (logging):
- Downgrade a pair of log messages that could occur when an exit's
resolver gave us an unusual (but not forbidden) response.
Closes ticket 24097.

5
src/or/dns.c
View File

@ -1578,10 +1578,11 @@ evdns_callback(int result, char type, int count, int ttl, void *addresses,
escaped_safe_str(hostname)); escaped_safe_str(hostname));
tor_free(escaped_address); tor_free(escaped_address);
} else if (count) { } else if (count) {
log_warn(LD_EXIT, "eventdns returned only non-IPv4 answers for %s.", log_info(LD_EXIT, "eventdns returned only unrecognized answer types "
" for %s.",
escaped_safe_str(string_address)); escaped_safe_str(string_address));
} else { } else {
log_warn(LD_BUG, "eventdns returned no addresses or error for %s!", log_info(LD_EXIT, "eventdns returned no addresses or error for %s.",
escaped_safe_str(string_address)); escaped_safe_str(string_address));
} }
} }