diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-10 12:16:21 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-10 12:16:21 -0400 |
| commit | 16f08de0fd85b9fe8ace9f4905190fa6dc27e4ea (patch) | |
| tree | 1f93ff4fcd5ab6f9e989cccb49f4c9c3c32aa62d /src/or/config.c | |
| parent | 395fa0258d56b24e39cd714834ffe0dcb365ea25 (diff) | |
| download | tor-16f08de0fd85b9fe8ace9f4905190fa6dc27e4ea.tar.gz tor-16f08de0fd85b9fe8ace9f4905190fa6dc27e4ea.zip | |
Remove TestingEnableTbEmptyEvent
This option was used for shadow testing previously, but is no longer
used for anything. It interferes with refactoring our token buckets.
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/or/config.c b/src/or/config.c index 3c3fd46e6f..71f8528b67 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -334,7 +334,7 @@ static config_var_t option_vars_[] = { V(DownloadExtraInfo, BOOL, "0"), V(TestingEnableConnBwEvent, BOOL, "0"), V(TestingEnableCellStatsEvent, BOOL, "0"), - V(TestingEnableTbEmptyEvent, BOOL, "0"), + OBSOLETE("TestingEnableTbEmptyEvent"), V(EnforceDistinctSubnets, BOOL, "1"), V(EntryNodes, ROUTERSET, NULL), V(EntryStatistics, BOOL, "0"), @@ -704,7 +704,6 @@ static const config_var_t testing_tor_network_defaults[] = { V(TestingDirConnectionMaxStall, INTERVAL, "30 seconds"), V(TestingEnableConnBwEvent, BOOL, "1"), V(TestingEnableCellStatsEvent, BOOL, "1"), - V(TestingEnableTbEmptyEvent, BOOL, "1"), VAR("___UsingTestNetworkDefaults", BOOL, UsingTestNetworkDefaults_, "1"), V(RendPostPeriod, INTERVAL, "2 minutes"), @@ -4499,12 +4498,6 @@ options_validate(or_options_t *old_options, or_options_t *options, "Tor networks!"); } - if (options->TestingEnableTbEmptyEvent && - !options->TestingTorNetwork && !options->UsingTestNetworkDefaults_) { - REJECT("TestingEnableTbEmptyEvent may only be changed in testing " - "Tor networks!"); - } - if (options->TestingTorNetwork) { log_warn(LD_CONFIG, "TestingTorNetwork is set. This will make your node " "almost unusable in the public Tor network, and is " |