From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 15 May 2011 15:44:51 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37e3fb8af20b02f764d0993218ed6025448073dd;p=thirdparty%2Ftor.git

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

Conflicts:
	src/or/connection_edge.c
---

37e3fb8af20b02f764d0993218ed6025448073dd
diff --cc src/or/connection_edge.c
index 186137b1df,7828f16386..ec3b417442
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@@ -847,11 -848,12 +848,12 @@@ addressmap_clear_excluded_trackexithost
      } else {
        nodename = tor_strndup(dot+1, strlen(dot+1)-5);
      }
 -    ri = router_get_by_nickname(nodename, 0);
 +    node = node_get_by_nickname(nodename, 0);
      tor_free(nodename);
 -    if (!ri ||
 -        (allow_nodes && !routerset_contains_router(allow_nodes, ri)) ||
 -        routerset_contains_router(exclude_nodes, ri) ||
 +    if (!node ||
 +        (allow_nodes && !routerset_contains_node(allow_nodes, node)) ||
-         routerset_contains_node(exclude_nodes, node)) {
++        routerset_contains_node(exclude_nodes, node) ||
+         !hostname_in_track_host_exits(options, address)) {
        /* We don't know this one, or we want to be rid of it. */
        addressmap_ent_remove(address, ent);
        MAP_DEL_CURRENT(address);