Merge remote-tracking branch 'asn/remove_legacy_guards'

1 files changed, 0 insertions, 13 deletions

diff --git a/src/or/channel.c b/src/or/channel.c
index dbf442eca0..45f1602ab2 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -2577,19 +2577,6 @@ channel_do_open_actions(channel_t *chan)
   if (started_here) {
     circuit_build_times_network_is_live(get_circuit_build_times_mutable());
     rep_hist_note_connect_succeeded(chan->identity_digest, now);
-#ifdef ENABLE_LEGACY_GUARD_ALGORITHM
-    // XXXX prop271 this call is no longer useful with the new algorithm.
-    if (entry_guard_register_connect_status(
-          chan->identity_digest, 1, 0, now) < 0) {
-      /* Close any circuits pending on this channel. We leave it in state
-       * 'open' though, because it didn't actually *fail* -- we just
-       * chose not to use it. */
-      log_debug(LD_OR,
-                "New entry guard was reachable, but closing this "
-                "connection so we can retry the earlier entry guards.");
-      close_origin_circuits = 1;
-    }
-#endif
     router_set_status(chan->identity_digest, 1);
   } else {
     /* only report it to the geoip module if it's not a known router */