Commit 4ef70ff3 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.3.2'

parents 4b56df98 05710158

changes/ticket24097

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  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.

src/or/dns.c

+3 −2
Original line number Diff line number Diff line
@@ -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));

    }

  }