[tor-commits] [tor/master] config: Remove CloseHSServiceRendCircuitsImmediatelyOnTimeout option

[nickm at torproject.org]

commit 60cf5ac2971f746852c92980a9292ed69a694e8c
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Apr 25 14:06:19 2017 -0400

    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 at torproject.org>
---
 changes/bug22060    | 3 +++
 doc/tor.1.txt       | 8 --------
 src/or/circuituse.c | 3 +--
 src/or/config.c     | 4 +---
 src/or/or.h         | 4 ----
 5 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/changes/bug22060 b/changes/bug22060
index 722547c..5b06427 100644
--- a/changes/bug22060
+++ b/changes/bug22060
@@ -12,3 +12,6 @@
     - CloseHSClientCircuitsImmediatelyOnTimeout was deprecated in
       0.2.9.2-alpha and now has been rendered obsolete. Code has been removed
       and feature no longer exists.
+    - CloseHSServiceRendCircuitsImmediatelyOnTimeout was deprecated in
+      0.2.9.2-alpha and now has been rendered obsolete. Code has been removed
+      and feature no longer exists.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index a5865b5..03943c9 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -963,14 +963,6 @@ The following options are useful only for clients (that is, if
     services can be configured to require authorization using the
     **HiddenServiceAuthorizeClient** option.
 
-[[CloseHSServiceRendCircuitsImmediatelyOnTimeout]] **CloseHSServiceRendCircuitsImmediatelyOnTimeout** **0**|**1**::
-    If 1, Tor will close unfinished hidden-service-side rendezvous
-    circuits after the current circuit-build timeout.  Otherwise, such
-    circuits will be left open, in the hope that they will finish
-    connecting to their destinations.  In either case, another
-    rendezvous circuit for the same destination client will be
-    launched. (Default: 0)
-
 [[LongLivedPorts]] **LongLivedPorts** __PORTS__::
     A list of ports for services that tend to have long-running connections
     (e.g. chat and interactive shells). Circuits for streams that use these
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 0ad3a72..b2bdfcd 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 3723a0f..5b69329 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 b186673..1cdfd1b 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