aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2020-10-14 09:46:44 -0400
committerDavid Goulet <dgoulet@torproject.org>2020-10-14 09:46:44 -0400
commitbb249a221f35fe3cef53df4c36c84c2d5e63b66d (patch)
tree1e0073cedcc48b20bd0e255c4c91c8401d0adfcf /doc
parentf02f8f8946bcfb0e11f9ce8c636845731cdddbeb (diff)
parenta251cff0c3c9cb04422c1d93ad6ea2e804b50a1e (diff)
downloadtor-bb249a221f35fe3cef53df4c36c84c2d5e63b66d.tar.gz
tor-bb249a221f35fe3cef53df4c36c84c2d5e63b66d.zip
Merge branch 'tor-gitlab/mr/170'
Diffstat (limited to 'doc')
-rw-r--r--doc/man/tor.1.txt9
1 files changed, 0 insertions, 9 deletions
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index c885eb79c0..860e1db33a 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -1309,15 +1309,6 @@ The following options are useful only for clients (that is, if
Every NUM seconds consider whether to build a new circuit. (Default: 30
seconds)
-[[OptimisticData]] **OptimisticData** **0**|**1**|**auto**::
- When this option is set, and Tor is using an exit node that supports
- the feature, it will try optimistically to send data to the exit node
- without waiting for the exit node to report whether the connection
- succeeded. This can save a round-trip time for protocols like HTTP
- where the client talks first. If OptimisticData is set to **auto**,
- Tor will look at the UseOptimisticData parameter in the networkstatus.
- (Default: auto)
-
// These are out of order because they logically belong together
[[PathBiasCircThreshold]] **PathBiasCircThreshold** __NUM__ +