From 60cf5ac2971f746852c92980a9292ed69a694e8c Mon Sep 17 00:00:00 2001 From: David Goulet Date: Tue, 25 Apr 2017 14:06:19 -0400 Subject: 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 --- src/or/circuituse.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/or/circuituse.c') 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.", -- cgit v1.2.3-54-g00ecf