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

Conflicts:
	src/or/connection_edge.c

diff --cc src/common/container.c
Simple merge

diff --cc src/or/circuituse.c
Simple merge

diff --cc src/or/circuituse.h
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/connection_edge.c
index 186137b1df69b1db1a94f8ea0d659903a7ec7172,7828f1638672cbe9a1d36209113d0af315a5bfb4..ec3b41744267a223970cc17e1bdb308a1e9b879a
--- 1/src/or/connection_edge.c
--- 2/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);

diff --cc src/or/connection_edge.h
Simple merge

diff --cc src/or/main.c
Simple merge

diff --cc src/or/or.h
Simple merge