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

diff --cc src/or/connection_edge.c
index 508f69e5a6f657b77b5e546f1692385a4f7d0cd1,4763bf59a2623bd1984ac2fd1c03191ad2e68f92..efaad79b6a0b544a17dd6bf3f690894ee6c71f61
--- 1/src/or/connection_edge.c
--- 2/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) {