diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-01-18 15:33:26 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-01-18 15:33:26 -0500 |
| commit | a31a5581eecc900c9e3d7be78ea06a3ea7fe32a3 (patch) | |
| tree | fc475732e4a79904fa7f42bd4c369f82b153fd12 /src/or/circuitbuild.c | |
| parent | 472b277207219d791a399d4d449af6ffdf00a081 (diff) | |
| download | tor-a31a5581eecc900c9e3d7be78ea06a3ea7fe32a3.tar.gz tor-a31a5581eecc900c9e3d7be78ea06a3ea7fe32a3.zip | |
Remove UseDeprecatedGuardAlgorithm.
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 91bd823451..f11c865ad0 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -967,10 +967,7 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) if (!hop) { /* done building the circuit. whew. */ guard_usable_t r; - if (get_options()->UseDeprecatedGuardAlgorithm) { - // The circuit is usable; we already marked the guard as okay. - r = GUARD_USABLE_NOW; - } else if (! circ->guard_state) { + if (! circ->guard_state) { if (circuit_get_cpath_len(circ) != 1 && circ->base_.purpose != CIRCUIT_PURPOSE_TESTING && get_options()->UseEntryGuards) { |