diff options
Diffstat (limited to 'src/or/bridges.c')
| -rw-r--r-- | src/or/bridges.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/or/bridges.c b/src/or/bridges.c index 7d1acdfeaa..8b37f412ea 100644 --- a/src/or/bridges.c +++ b/src/or/bridges.c @@ -761,29 +761,13 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache) fmt_and_decorate_addr(&bridge->addr), (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); - } + entry_guard_learned_bridge_identity(&bridge->addrport_configured, + (const uint8_t*)ri->cache_info.identity_digest); log_notice(LD_DIR, "new bridge descriptor '%s' (%s): %s", ri->nickname, from_cache ? "cached" : "fresh", router_describe(ri)); /* 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); } |