summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--src/or/circuitbuild.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0275953350..d708ed77b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,6 +57,8 @@ Changes in version 0.1.2.7-alpha - 2007-??-??
instead, only add it the OR connection that will eventually receive it
has some room for it. (This can lead to slowdowns in tunneled dir
connectinos; a better solution will have to wait for 0.2.0.)
+ - If the user asks to use invalid exit nodes, be willing to use the
+ unstable ones.
o Major features:
- Weight directory requests by advertised bandwidth. Now we can
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 416017ccb4..becfaf89fa 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1187,10 +1187,8 @@ choose_good_exit_server_general(routerlist_t *dir, int need_uptime,
n_supported[i] = -1;
continue; /* skip routers that are not suitable */
}
- if (!router->is_valid &&
- (!(options->_AllowInvalid & ALLOW_INVALID_EXIT) ||
- router_is_unreliable(router, 1, 1, 0))) {
- /* if it's invalid, and either we don't want it or it's unsuitable */
+ if (!(router->is_valid || options->_AllowInvalid & ALLOW_INVALID_EXIT)) {
+ /* if it's invalid and we don't want it */
n_supported[i] = -1;
// log_fn(LOG_DEBUG,"Skipping node %s (index %d) -- invalid router.",
// router->nickname, i);