[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 384e300cb4bc075f3b07e45017c9b5bcda050954
Merge: 0a083b0 5aa45ed
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 19 23:16:08 2011 -0400

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

 changes/bug4259          |    4 ++++
 src/or/connection_edge.c |    5 ++++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --cc src/or/connection_edge.c
index 508f69e,4763bf5..efaad79
--- 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) {