Merge branch 'maint-0.2.1'

2 files changed, 1 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 0b405f849d..c6bfd4c5f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -216,8 +216,6 @@ Changes in version 0.2.1.20 - 2009-??-??
       excluded in ExcludeExitNodes, but the circuit is not used to access
       the outside world. This should help fix bug 1090. Bugfix on
       0.2.1.6-alpha.
-    - Teach connection_ap_can_use_exit to respect the Exclude*Nodes config
-      options. Should fix bug 1090. Bugfix on 0.0.2-pre16.
     - Avoid segfault in rare cases when finishing an introduction circuit
       as a client and finding out that we don't have an introduction key
       for it. Fixes bug 1073. Reported by Aaron Swartz.
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 478bdf2b24..f25202725e 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2838,13 +2838,11 @@ connection_edge_is_rendezvous_stream(edge_connection_t *conn)
 /** Return 1 if router <b>exit</b> is likely to allow stream <b>conn</b>
  * to exit from it, or 0 if it probably will not allow it.
  * (We might be uncertain if conn's destination address has not yet been
- * resolved.) If the router is in the list of excluded nodes, also return 0;
+ * resolved.)
  */
 int
 connection_ap_can_use_exit(edge_connection_t *conn, routerinfo_t *exit)
 {
-  or_options_t *options = get_options();
-
   tor_assert(conn);
   tor_assert(conn->_base.type == CONN_TYPE_AP);
   tor_assert(conn->socks_request);
@@ -2890,10 +2888,6 @@ connection_ap_can_use_exit(edge_connection_t *conn, routerinfo_t *exit)
     if (!conn->chosen_exit_name && policy_is_reject_star(exit->exit_policy))
       return 0;
   }
-  if (options->_ExcludeExitNodesUnion &&
-      routerset_contains_router(options->_ExcludeExitNodesUnion, exit))
-    return 0;
-
   return 1;
 }