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

changes/bug4259

@@ -0,0 +1,4 @@
+  o Major bugfixes:
+    - Fix a crash bug when changing node restrictions while a DNS lookup
+      is in-progress. Fixes bug 4259; bugfix on 0.2.2.25-alpha. Bugfix
+      by "Tey'".

src/or/connection_edge.c

@@ -944,7 +944,10 @@ addressmap_clear_excluded_trackexithosts(const or_options_t *options)
     char *nodename;
     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) {