Merge remote-tracking branch 'tor-github/pr/1620'

6 files changed, 5 insertions, 27 deletions

diff --git a/changes/ticket32807 b/changes/ticket32807
new file mode 100644
index 0000000000..07f8716e1f
--- /dev/null
+++ b/changes/ticket32807
@@ -0,0 +1,4 @@
+  o Removed features:
+    - The option "TestingEstimatedDescriptorPropagationTime" is now marked as
+      obsolete.  It has had no effect since 0.3.0.7, when clients stopped
+      rejecting consensuses "from the future".  Closes ticket 32807.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index aad37204c9..85369dfcef 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -3256,7 +3256,6 @@ The following options are used for running a testing Tor network.
        TestingV3AuthInitialVoteDelay 20 seconds
        TestingV3AuthInitialDistDelay 20 seconds
        TestingAuthDirTimeToLearnReachability 0 minutes
-       TestingEstimatedDescriptorPropagationTime 0 minutes
        TestingServerDownloadInitialDelay 0
        TestingClientDownloadInitialDelay 0
        TestingServerConsensusDownloadInitialDelay 0
@@ -3292,11 +3291,6 @@ The following options are used for running a testing Tor network.
     are Running until this much time has passed. Changing this requires
     that **TestingTorNetwork** is set.  (Default: 30 minutes)
 
-[[TestingEstimatedDescriptorPropagationTime]] **TestingEstimatedDescriptorPropagationTime** __N__ **minutes**|**hours**::
-    Clients try downloading server descriptors from directory caches after this
-    time. Changing this requires that **TestingTorNetwork** is set. (Default:
-    10 minutes)
-
 [[TestingMinFastFlagThreshold]] **TestingMinFastFlagThreshold** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
     Minimum value for the Fast flag.  Overrides the ordinary minimum taken
     from the consensus when TestingTorNetwork is set. (Default: 0.)
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 680a7eeefa..72ab065fb5 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -451,7 +451,7 @@ static const config_var_t option_vars_[] = {
   V(EnforceDistinctSubnets,      BOOL,     "1"),
   V_D(EntryNodes,                ROUTERSET,   NULL),
   V(EntryStatistics,             BOOL,     "0"),
-  V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "10 minutes"),
+  OBSOLETE("TestingEstimatedDescriptorPropagationTime"),
   V_D(ExcludeNodes,              ROUTERSET, NULL),
   V_D(ExcludeExitNodes,          ROUTERSET, NULL),
   OBSOLETE("ExcludeSingleHopRelays"),
@@ -4123,7 +4123,6 @@ options_validate_cb(const void *old_options_, void *options_, char **msg)
     CHECK_DEFAULT(TestingV3AuthInitialDistDelay);
     CHECK_DEFAULT(TestingV3AuthVotingStartOffset);
     CHECK_DEFAULT(TestingAuthDirTimeToLearnReachability);
-    CHECK_DEFAULT(TestingEstimatedDescriptorPropagationTime);
     CHECK_DEFAULT(TestingServerDownloadInitialDelay);
     CHECK_DEFAULT(TestingClientDownloadInitialDelay);
     CHECK_DEFAULT(TestingServerConsensusDownloadInitialDelay);
@@ -4151,12 +4150,6 @@ options_validate_cb(const void *old_options_, void *options_, char **msg)
   if (options_validate_dirauth_testing(old_options, options, msg) < 0)
     return -1;
 
-  if (options->TestingEstimatedDescriptorPropagationTime < 0) {
-    REJECT("TestingEstimatedDescriptorPropagationTime must be non-negative.");
-  } else if (options->TestingEstimatedDescriptorPropagationTime > 60*60) {
-    COMPLAIN("TestingEstimatedDescriptorPropagationTime is insanely high.");
-  }
-
   if (options->TestingClientMaxIntervalWithoutRequest < 1) {
     REJECT("TestingClientMaxIntervalWithoutRequest is way too low.");
   } else if (options->TestingClientMaxIntervalWithoutRequest > 3600) {
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index e63ae2510f..4915be187c 100644
--- a/src/app/config/or_options_st.h
+++ b/src/app/config/or_options_st.h
@@ -723,11 +723,6 @@ struct or_options_t {
    * altered on testing networks. */
   int TestingAuthDirTimeToLearnReachability;
 
-  /** Clients don't download any descriptor this recent, since it will
-   * probably not have propagated to enough caches.  Only altered on testing
-   * networks. */
-  int TestingEstimatedDescriptorPropagationTime;
-
   /** Schedule for when servers should download things in general.  Only
    * altered on testing networks. */
   int TestingServerDownloadInitialDelay;
diff --git a/src/app/config/testnet.inc b/src/app/config/testnet.inc
index 0ed3c38627..f146a03cd1 100644
--- a/src/app/config/testnet.inc
+++ b/src/app/config/testnet.inc
@@ -17,7 +17,6 @@
 { "TestingV3AuthInitialVoteDelay", "20 seconds" },
 { "TestingV3AuthInitialDistDelay", "20 seconds" },
 { "TestingAuthDirTimeToLearnReachability", "0 minutes" },
-{ "TestingEstimatedDescriptorPropagationTime", "0 minutes" },
 { "MinUptimeHidServDirectoryV2", "0 minutes" },
 { "TestingServerDownloadInitialDelay", "0" },
 { "TestingClientDownloadInitialDelay", "0" },
diff --git a/src/test/test_options.c b/src/test/test_options.c
index e3b86c81ad..b99ae78932 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -2001,7 +2001,6 @@ test_options_validate__testing(void *ignored)
   ENSURE_DEFAULT(TestingV3AuthInitialDistDelay, 3000);
   ENSURE_DEFAULT(TestingV3AuthVotingStartOffset, 3000);
   ENSURE_DEFAULT(TestingAuthDirTimeToLearnReachability, 3000);
-  ENSURE_DEFAULT(TestingEstimatedDescriptorPropagationTime, 3000);
   ENSURE_DEFAULT(TestingServerDownloadInitialDelay, 3000);
   ENSURE_DEFAULT(TestingClientDownloadInitialDelay, 3000);
   ENSURE_DEFAULT(TestingServerConsensusDownloadInitialDelay, 3000);
@@ -3872,22 +3871,16 @@ test_options_validate__testing_options(void *ignored)
   TEST_TESTING_OPTION(TestingAuthDirTimeToLearnReachability, -1, 8000,
                       "must be non-negative.", ENABLE_AUTHORITY_BRIDGE);
 
-  TEST_TESTING_OPTION(TestingEstimatedDescriptorPropagationTime, -1, 3601,
-                      "must be non-negative.", "");
   TEST_TESTING_OPTION(TestingClientMaxIntervalWithoutRequest, -1, 3601,
                       "is way too low.", "");
   TEST_TESTING_OPTION(TestingDirConnectionMaxStall, 1, 3601,
                       "is way too low.", "");
 
-  TEST_TESTING_OPTION(TestingEstimatedDescriptorPropagationTime, -1, 3601,
-                      "must be non-negative.", ENABLE_AUTHORITY_V3);
   TEST_TESTING_OPTION(TestingClientMaxIntervalWithoutRequest, -1, 3601,
                       "is way too low.", ENABLE_AUTHORITY_V3);
   TEST_TESTING_OPTION(TestingDirConnectionMaxStall, 1, 3601,
                       "is way too low.", ENABLE_AUTHORITY_V3);
 
-  TEST_TESTING_OPTION(TestingEstimatedDescriptorPropagationTime, -1, 3601,
-                      "must be non-negative.", ENABLE_AUTHORITY_BRIDGE);
   TEST_TESTING_OPTION(TestingClientMaxIntervalWithoutRequest, -1, 3601,
                       "is way too low.", ENABLE_AUTHORITY_BRIDGE);
   TEST_TESTING_OPTION(TestingDirConnectionMaxStall, 1, 3601,