[tor-commits] [tor/master] Remove redundant items from testing_tor_network_defaults

[nickm at torproject.org]

commit 6ff67389631100d076482e573859d0f8f85255ac
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 12 16:23:37 2017 -0400

    Remove redundant items from testing_tor_network_defaults
    
    These items were listed in testing_tor_network_defaults, but had the
    same defaults as with the regular settings.
    
    Closes ticket 22532.
---
 src/or/config.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 55c9531f4..a5bda8be0 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -624,7 +624,6 @@ static config_var_t option_vars_[] = {
 /** Override default values with these if the user sets the TestingTorNetwork
  * option. */
 static const config_var_t testing_tor_network_defaults[] = {
-  V(ServerDNSAllowBrokenConfig,  BOOL,     "1"),
   V(DirAllowPrivateAddresses,    BOOL,     "1"),
   V(EnforceDistinctSubnets,      BOOL,     "0"),
   V(AssumeReachable,             BOOL,     "1"),
@@ -648,7 +647,6 @@ static const config_var_t testing_tor_network_defaults[] = {
   V(TestingV3AuthInitialVotingInterval, INTERVAL, "150 seconds"),
   V(TestingV3AuthInitialVoteDelay, INTERVAL, "20 seconds"),
   V(TestingV3AuthInitialDistDelay, INTERVAL, "20 seconds"),
-  V(TestingV3AuthVotingStartOffset, INTERVAL, "0"),
   V(TestingAuthDirTimeToLearnReachability, INTERVAL, "0 minutes"),
   V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "0 minutes"),
   V(MinUptimeHidServDirectoryV2, INTERVAL, "0 minutes"),