commit 37e3fb8af20b02f764d0993218ed6025448073dd Merge: 2fd9cfd f287100 Author: Nick Mathewson nickm@torproject.org Date: Sun May 15 11:44:51 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts: src/or/connection_edge.c
changes/bug1345 | 13 +++++++++++ src/common/container.c | 19 +++++++++++++++++ src/common/container.h | 2 + src/or/circuituse.c | 51 +++++++++++++++++++++++++-------------------- src/or/circuituse.h | 2 + src/or/config.c | 23 ++++++++++++++++++++ src/or/connection_edge.c | 51 +++++++++++++++++++++++++++++++++++++++++++-- src/or/connection_edge.h | 1 + src/or/main.c | 1 - src/or/or.h | 3 ++ 10 files changed, 139 insertions(+), 27 deletions(-)
diff --cc src/or/connection_edge.c index 186137b,7828f16..ec3b417 --- 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);