diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-10-14 09:46:44 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-10-14 09:46:44 -0400 |
| commit | bb249a221f35fe3cef53df4c36c84c2d5e63b66d (patch) | |
| tree | 1e0073cedcc48b20bd0e255c4c91c8401d0adfcf /src/test/conf_examples | |
| parent | f02f8f8946bcfb0e11f9ce8c636845731cdddbeb (diff) | |
| parent | a251cff0c3c9cb04422c1d93ad6ea2e804b50a1e (diff) | |
| download | tor-bb249a221f35fe3cef53df4c36c84c2d5e63b66d.tar.gz tor-bb249a221f35fe3cef53df4c36c84c2d5e63b66d.zip | |
Merge branch 'tor-gitlab/mr/170'
Diffstat (limited to 'src/test/conf_examples')
| -rw-r--r-- | src/test/conf_examples/large_1/expected | 1 | ||||
| -rw-r--r-- | src/test/conf_examples/large_1/expected_no_dirauth | 1 |
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 fcb83d54cb..fcd19db3df 100644 --- a/src/test/conf_examples/large_1/expected +++ b/src/test/conf_examples/large_1/expected @@ -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 diff --git a/src/test/conf_examples/large_1/expected_no_dirauth b/src/test/conf_examples/large_1/expected_no_dirauth index 6e1b9e8a9f..4a19bc546c 100644 --- a/src/test/conf_examples/large_1/expected_no_dirauth +++ b/src/test/conf_examples/large_1/expected_no_dirauth @@ -109,7 +109,6 @@ NumDirectoryGuards 4 NumEntryGuards 5 NumPrimaryGuards 8 OfflineMasterKey 1 -OptimisticData 1 ORPort 2222 OutboundBindAddress 10.0.0.7 OutboundBindAddressExit 10.0.0.8 |