From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 20 Oct 2011 03:16:08 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.6-alpha~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=384e300cb4bc075f3b07e45017c9b5bcda050954;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.2'
---

384e300cb4bc075f3b07e45017c9b5bcda050954
diff --cc src/or/connection_edge.c
index 508f69e5a6,4763bf59a2..efaad79b6a
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@@ -942,9 -829,12 +942,12 @@@ addressmap_clear_excluded_trackexithost
      size_t len;
      const char *target = ent->new_address, *dot;
      char *nodename;
 -    routerinfo_t *ri; /* XXX023 Use node_t. */
 +    const node_t *node;
  
-     if (strcmpend(target, ".exit")) {
+     if (!target) {
+       /* DNS resolving in progress */
+       continue;
+     } else if (strcmpend(target, ".exit")) {
        /* Not a .exit mapping */
        continue;
      } else if (ent->source != ADDRMAPSRC_TRACKEXIT) {