diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-16 11:20:59 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-16 11:20:59 -0500 |
| commit | 2cee38f76a46860e2fb29fbd95ba36b332aa38c6 (patch) | |
| tree | 3b2cbaeff1472c8d23c18f3e88bc4735bbb22bcc /src/or/channel.c | |
| parent | b310929ee36f0a88389dca53124506115c850c3b (diff) | |
| parent | 20292ec4974b777d430e7962cc38349c5f82b220 (diff) | |
| download | tor-2cee38f76a46860e2fb29fbd95ba36b332aa38c6.tar.gz tor-2cee38f76a46860e2fb29fbd95ba36b332aa38c6.zip | |
Merge branch 'prop271_030_v1_squashed'
Diffstat (limited to 'src/or/channel.c')
| -rw-r--r-- | src/or/channel.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/channel.c b/src/or/channel.c index 7984558b40..2951a1d665 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -2578,6 +2578,8 @@ 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 @@ -2588,6 +2590,7 @@ channel_do_open_actions(channel_t *chan) "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 */ |