diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-01-18 15:27:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-01-18 15:27:10 -0500 |
| commit | 472b277207219d791a399d4d449af6ffdf00a081 (patch) | |
| tree | 5a174ebfac759081c1c6c2adf614c43cc75325c3 /src/or/routerlist.c | |
| parent | e167a0e17d9211205651b07b65b0e83695bf6cf1 (diff) | |
| download | tor-472b277207219d791a399d4d449af6ffdf00a081.tar.gz tor-472b277207219d791a399d4d449af6ffdf00a081.zip | |
Remove the (no longer compiled) code for legacy guard selection.
Part of 20830.
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 72474b1152..03f8bc7744 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1999,10 +1999,7 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, const int for_guard = (flags & PDS_FOR_GUARD); int try_excluding = 1, n_excluded = 0, n_busy = 0; int try_ip_pref = 1; - -#ifndef ENABLE_LEGACY_GUARD_ALGORITHM - tor_assert_nonfatal(! for_guard); -#endif + tor_assert_nonfatal(! for_guard); // XXXX prop271 if (!consensus) return NULL; @@ -2036,12 +2033,6 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, SKIP_MISSING_TRUSTED_EXTRAINFO(type, node->identity); -#ifdef ENABLE_LEGACY_GUARD_ALGORITHM - /* Don't make the same node a guard twice */ - if (for_guard && is_node_used_as_guard(node)) { - continue; - } -#endif /* Ensure that a directory guard is actually a guard node. */ if (for_guard && !node->is_possible_guard) { continue; |