diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-04 12:26:59 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-04 12:26:59 -0500 |
| commit | 69f7c0385b16acdfa4a38cb36c86aaceebf61301 (patch) | |
| tree | e252207389dbc10af5937a7bca14a26943962510 /src/or/routerlist.c | |
| parent | a6c811313af3cfda1fca1d7595e9259f51d6ffd0 (diff) | |
| parent | e9803aa71003079cc00a8b3c80324581758a36be (diff) | |
| download | tor-69f7c0385b16acdfa4a38cb36c86aaceebf61301.tar tor-69f7c0385b16acdfa4a38cb36c86aaceebf61301.tar.gz | |
Merge remote branch 'origin/maint-0.2.2' for bug2203_rebased
There was a merge conflict in routerlist.c due to the new node_t logic.
Conflicts:
src/or/routerlist.c
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 380e34b99..66066f68d 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1726,7 +1726,7 @@ smartlist_choose_node_by_bandwidth_weights(smartlist_t *sl, SMARTLIST_FOREACH_BEGIN(sl, const node_t *, node) { int is_exit = 0, is_guard = 0, is_dir = 0, this_bw = 0, is_me = 0; double weight = 1; - is_exit = node->is_exit; + is_exit = node->is_exit && ! node->is_bad_exit; is_guard = node->is_possible_guard; is_dir = node_is_dir(node); if (node->rs) { |