diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-01-18 15:42:28 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-01-18 15:42:28 -0500 |
| commit | 5b97d7e110a1a4c9051d63f090c2a919416088ff (patch) | |
| tree | f772c19dc2d0698f24d16b06a2afeb8e21f05c0c /src/or/routerlist.c | |
| parent | 6d03e36fd07eabf90c99e17c0aa3e13271e83fb6 (diff) | |
| download | tor-5b97d7e110a1a4c9051d63f090c2a919416088ff.tar.gz tor-5b97d7e110a1a4c9051d63f090c2a919416088ff.zip | |
Remove PDS_FOR_GUARD
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 03f8bc7744..4735271069 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1996,10 +1996,8 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, const int fascistfirewall = ! (flags & PDS_IGNORE_FASCISTFIREWALL); const int no_serverdesc_fetching =(flags & PDS_NO_EXISTING_SERVERDESC_FETCH); const int no_microdesc_fetching = (flags & PDS_NO_EXISTING_MICRODESC_FETCH); - const int for_guard = (flags & PDS_FOR_GUARD); int try_excluding = 1, n_excluded = 0, n_busy = 0; int try_ip_pref = 1; - tor_assert_nonfatal(! for_guard); // XXXX prop271 if (!consensus) return NULL; @@ -2033,10 +2031,6 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, SKIP_MISSING_TRUSTED_EXTRAINFO(type, node->identity); - /* Ensure that a directory guard is actually a guard node. */ - if (for_guard && !node->is_possible_guard) { - continue; - } if (try_excluding && routerset_contains_routerstatus(options->ExcludeNodes, status, country)) { |