diff options
| author | David Goulet <dgoulet@torproject.org> | 2017-04-25 14:06:19 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-09 10:30:52 -0400 |
| commit | 60cf5ac2971f746852c92980a9292ed69a694e8c (patch) | |
| tree | a5347bda4dbdea489d3d5439539d9441c9d523eb /src/or/circuituse.c | |
| parent | 87e9dc48d135b0c1b6ebaeefac5cf966d6fdaca1 (diff) | |
| download | tor-60cf5ac2971f746852c92980a9292ed69a694e8c.tar.gz tor-60cf5ac2971f746852c92980a9292ed69a694e8c.zip | |
config: Remove CloseHSServiceRendCircuitsImmediatelyOnTimeout option
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans
up the code associated with it.
Partially fixes #22060
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 0ad3a726ed..b2bdfcd68b 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -747,8 +747,7 @@ circuit_expire_building(void) /* If this is a service-side rendezvous circuit which is far * enough along in connecting to its destination, consider sparing * it. */ - if (!(options->CloseHSServiceRendCircuitsImmediatelyOnTimeout) && - !(TO_ORIGIN_CIRCUIT(victim)->hs_circ_has_timed_out) && + if (!(TO_ORIGIN_CIRCUIT(victim)->hs_circ_has_timed_out) && victim->purpose == CIRCUIT_PURPOSE_S_CONNECT_REND) { log_info(LD_CIRC,"Marking circ %u (state %d:%s, purpose %d) " "as timed-out HS circ; relaunching rendezvous attempt.", |