summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-17 08:35:01 -0500
committerNick Mathewson <nickm@torproject.org>2017-11-17 08:35:01 -0500
commit0571015819317f6b52416d8023a99ee5a8f31dee (patch)
treef9729d1f2d09fbee848d675c15f0a54347e139ff
parent0684e6c6f0b1d6dad12d4a7e40f163671ee44f84 (diff)
parent2a98fcb84859a8dfadf1c3430b901f0d8e6b3f06 (diff)
downloadtor-0571015819317f6b52416d8023a99ee5a8f31dee.tar.gz
tor-0571015819317f6b52416d8023a99ee5a8f31dee.zip
Merge branch 'ticket24097_032' into maint-0.3.2
-rw-r--r--changes/ticket240974
-rw-r--r--src/or/dns.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/changes/ticket24097 b/changes/ticket24097
new file mode 100644
index 0000000000..36547a8ddb
--- /dev/null
+++ b/changes/ticket24097
@@ -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.
diff --git a/src/or/dns.c b/src/or/dns.c
index 4194a29a6b..7dc3575f53 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -1578,10 +1578,11 @@ evdns_callback(int result, char type, int count, int ttl, void *addresses,
escaped_safe_str(hostname));
tor_free(escaped_address);
} 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));
} 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));
}
}