Browse Source

Merge remote-tracking branch 'public/bug5932'

Nick Mathewson 12 years ago
parent
commit
879b1e1010
2 changed files with 4 additions and 1 deletions
  1. 3 0
      changes/bug5932
  2. 1 1
      src/or/dns.c

+ 3 - 0
changes/bug5932

@@ -0,0 +1,3 @@
+  o Minor bugfixes:
+    - Downgrade "eventdns rejected address" message to LOG_PROTOCOL_WARN.
+      Fixes bug 5932; bugfix on 0.2.2.7-alpha.

+ 1 - 1
src/or/dns.c

@@ -1437,7 +1437,7 @@ launch_resolve(edge_connection_t *exitconn)
 
   r = 0;
   if (!req) {
-    log_warn(LD_EXIT, "eventdns rejected address %s.",
+    log_fn(LOG_PROTOCOL_WARN, LD_EXIT, "eventdns rejected address %s.",
              escaped_safe_str(addr));
     r = -1;
     tor_free(addr); /* There is no evdns request in progress; stop