diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-04 12:22:18 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-04 12:22:18 -0500 |
| commit | e9803aa71003079cc00a8b3c80324581758a36be (patch) | |
| tree | c8d6d15daf5a525f52ce2f923c755a830671f8c1 /src/or/routerlist.c | |
| parent | f9e251ccf8c72dadf55b51ba9695d8dd5ef6d6f1 (diff) | |
| parent | 5774ada5d29ec7abd5a258ff165755c946e97f5f (diff) | |
| download | tor-e9803aa71003079cc00a8b3c80324581758a36be.tar.gz tor-e9803aa71003079cc00a8b3c80324581758a36be.zip | |
Merge branch 'bug2203_rebased' into maint-0.2.2
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 47caebf8df..6d6386292f 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1722,7 +1722,7 @@ smartlist_choose_by_bandwidth_weights(smartlist_t *sl, double weight = 1; if (statuses) { routerstatus_t *status = smartlist_get(sl, i); - is_exit = status->is_exit; + is_exit = status->is_exit && !status->is_bad_exit; is_guard = status->is_possible_guard; is_dir = (status->dir_port != 0); if (!status->has_bandwidth) { @@ -1742,7 +1742,7 @@ smartlist_choose_by_bandwidth_weights(smartlist_t *sl, routerinfo_t *router = smartlist_get(sl, i); rs = router_get_consensus_status_by_id( router->cache_info.identity_digest); - is_exit = router->is_exit; + is_exit = router->is_exit && !router->is_bad_exit; is_guard = router->is_possible_guard; is_dir = (router->dir_port != 0); if (rs && rs->has_bandwidth) { |