aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-17 08:35:04 -0500
committerNick Mathewson <nickm@torproject.org>2017-11-17 08:35:04 -0500
commit4ef70ff389917f99cbee054bba78872b0b91a556 (patch)
treed94085cd2ede8e19ae49d11c26923d523d973e0b
parent4b56df9874cb67d1a9e72626bbfc69bbd40b593b (diff)
parent0571015819317f6b52416d8023a99ee5a8f31dee (diff)
downloadtor-4ef70ff389917f99cbee054bba78872b0b91a556.tar.gz
tor-4ef70ff389917f99cbee054bba78872b0b91a556.zip
Merge branch '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 c992c8c358..f140051e81 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));
}
}