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 | |
| 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')
| -rw-r--r-- | src/or/circuituse.c | 3 | ||||
| -rw-r--r-- | src/or/config.c | 4 | ||||
| -rw-r--r-- | src/or/or.h | 4 |
3 files changed, 2 insertions, 9 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.", diff --git a/src/or/config.c b/src/or/config.c index 3723a0f966..5b6932987c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -361,7 +361,7 @@ static config_var_t option_vars_[] = { VAR("HiddenServiceStatistics", BOOL, HiddenServiceStatistics_option, "1"), V(HidServAuth, LINELIST, NULL), OBSOLETE("CloseHSClientCircuitsImmediatelyOnTimeout"), - V(CloseHSServiceRendCircuitsImmediatelyOnTimeout, BOOL, "0"), + OBSOLETE("CloseHSServiceRendCircuitsImmediatelyOnTimeout"), V(HiddenServiceSingleHopMode, BOOL, "0"), V(HiddenServiceNonAnonymousMode,BOOL, "0"), V(HTTPProxy, STRING, NULL), @@ -664,8 +664,6 @@ static const config_deprecation_t option_deprecation_notes_[] = { "a wide variety of application-level attacks." }, { "ClientDNSRejectInternalAddresses", "Turning this on makes your client " "easier to fingerprint, and may open you to esoteric attacks." }, - { "CloseHSServiceRendCircuitsImmediatelyOnTimeout", "This option makes " - "your hidden services easier to fingerprint." }, { "WarnUnsafeSocks", "Changing this option makes it easier for you " "to accidentally lose your anonymity by leaking DNS information" }, { "TLSECGroup", "The default is a nice secure choice; the other option " diff --git a/src/or/or.h b/src/or/or.h index b186673674..1cdfd1b458 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3769,10 +3769,6 @@ typedef struct { /** A routerset that should be used when picking RPs for HS circuits. */ routerset_t *Tor2webRendezvousPoints; - /** Close hidden-service-side rendezvous circuits immediately when - * they reach the normal circuit-build timeout. */ - int CloseHSServiceRendCircuitsImmediatelyOnTimeout; - /** Onion Services in HiddenServiceSingleHopMode make one-hop (direct) * circuits between the onion service server, and the introduction and * rendezvous points. (Onion service descriptors are still posted using |