diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-10-19 23:16:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-10-19 23:16:08 -0400 |
| commit | 384e300cb4bc075f3b07e45017c9b5bcda050954 (patch) | |
| tree | 544c0e704a537739ccabf5234dd9a2772bafb244 /src/or/connection_edge.c | |
| parent | 0a083b0188cacd2f07838ff0446113bd5211a024 (diff) | |
| parent | 5aa45ed6af87efaec5d6d4a32e8acbc733be8c3d (diff) | |
| download | tor-384e300cb4bc075f3b07e45017c9b5bcda050954.tar tor-384e300cb4bc075f3b07e45017c9b5bcda050954.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/connection_edge.c')
| -rw-r--r-- | src/or/connection_edge.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 508f69e5a..efaad79b6 100644 --- a/src/or/connection_edge.c +++ b/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) { |