aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-10-13 14:37:40 -0400
committerNick Mathewson <nickm@torproject.org>2020-10-13 14:38:32 -0400
commit42a5e652cb9dc9818abd63d93fd51e908f2c56a4 (patch)
treefa777792bec97c4fcccba8fa36eb6b2596ad7ad7 /src/test
parentac311a38ec62e17868b484b8ace069d171c7506d (diff)
downloadtor-42a5e652cb9dc9818abd63d93fd51e908f2c56a4.tar.gz
tor-42a5e652cb9dc9818abd63d93fd51e908f2c56a4.zip
Make OptimisticData always-on.
We've been using it for years, and it seems to work just fine. This patch removes the option and its network parameter. Part of #40139
Diffstat (limited to 'src/test')
-rw-r--r--src/test/conf_examples/large_1/expected1
-rw-r--r--src/test/conf_examples/large_1/expected_no_dirauth1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/test/conf_examples/large_1/expected b/src/test/conf_examples/large_1/expected
index 99a12ffc84..7197993350 100644
--- a/src/test/conf_examples/large_1/expected
+++ b/src/test/conf_examples/large_1/expected
@@ -111,7 +111,6 @@ NumDirectoryGuards 4
NumEntryGuards 5
NumPrimaryGuards 8
OfflineMasterKey 1
-OptimisticData 1
ORPort 2222
OutboundBindAddress 10.0.0.7
OutboundBindAddressExit 10.0.0.8
diff --git a/src/test/conf_examples/large_1/expected_no_dirauth b/src/test/conf_examples/large_1/expected_no_dirauth
index 26a33bdc7c..15919dae1b 100644
--- a/src/test/conf_examples/large_1/expected_no_dirauth
+++ b/src/test/conf_examples/large_1/expected_no_dirauth
@@ -110,7 +110,6 @@ NumDirectoryGuards 4
NumEntryGuards 5
NumPrimaryGuards 8
OfflineMasterKey 1
-OptimisticData 1
ORPort 2222
OutboundBindAddress 10.0.0.7
OutboundBindAddressExit 10.0.0.8