aboutsummaryrefslogtreecommitdiff
path: root/src/or/bridges.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-01-18 15:27:10 -0500
committerNick Mathewson <nickm@torproject.org>2017-01-18 15:27:10 -0500
commit472b277207219d791a399d4d449af6ffdf00a081 (patch)
tree5a174ebfac759081c1c6c2adf614c43cc75325c3 /src/or/bridges.c
parente167a0e17d9211205651b07b65b0e83695bf6cf1 (diff)
downloadtor-472b277207219d791a399d4d449af6ffdf00a081.tar.gz
tor-472b277207219d791a399d4d449af6ffdf00a081.zip
Remove the (no longer compiled) code for legacy guard selection.
Part of 20830.
Diffstat (limited to 'src/or/bridges.c')
-rw-r--r--src/or/bridges.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/or/bridges.c b/src/or/bridges.c
index 7d1acdfeaa..d9a8873c96 100644
--- a/src/or/bridges.c
+++ b/src/or/bridges.c
@@ -762,11 +762,7 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache)
(int) bridge->port);
}
if (get_options()->UseDeprecatedGuardAlgorithm) {
-#ifdef ENABLE_LEGACY_GUARD_ALGORITHM
- add_bridge_as_entry_guard(get_guard_selection_info(), node);
-#else
tor_assert_nonfatal_unreached();
-#endif
} else {
entry_guard_learned_bridge_identity(&bridge->addrport_configured,
(const uint8_t*)ri->cache_info.identity_digest);
@@ -777,12 +773,7 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache)
/* set entry->made_contact so if it goes down we don't drop it from
* our entry node list */
if (get_options()->UseDeprecatedGuardAlgorithm) {
-#ifdef ENABLE_LEGACY_GUARD_ALGORITHM
- entry_guard_register_connect_status(ri->cache_info.identity_digest,
- 1, 0, now);
-#else
tor_assert_nonfatal_unreached();
-#endif
}
if (first) {
routerlist_retry_directory_downloads(now);