aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorteor <teor2345@gmail.com>2017-08-29 13:48:30 +1000
committerteor <teor2345@gmail.com>2017-08-29 13:48:30 +1000
commit435952538da2d99e7ce46f510ac3f7dc3f910fca (patch)
tree842105688f92dbf14e382abe64f69661d4b8254f /doc
parentf9cd870f50d770f629e370583b0e9df2f8844436 (diff)
downloadtor-435952538da2d99e7ce46f510ac3f7dc3f910fca.tar.gz
tor-435952538da2d99e7ce46f510ac3f7dc3f910fca.zip
Make the download defaults in the tor manual match the code
Documentation fix on commit 667ba77, which was part of #20534.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 03af9c4be8..9949f9dd0e 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1571,8 +1571,8 @@ The following options are useful only for clients (that is, if
live consensus). Only used by clients fetching from a list of fallback
directory mirrors. This schedule is advanced by (potentially concurrent)
connection attempts, unlike other schedules, which are advanced by
- connection failures. (Default: 10, 11, 3600, 10800, 25200, 54000,
- 111600, 262800)
+ connection failures. (Default: 6, 11, 3600, 10800, 25200, 54000, 111600,
+ 262800)
[[ClientBootstrapConsensusFallbackDownloadSchedule]] **ClientBootstrapConsensusFallbackDownloadSchedule** __N__,__N__,__...__::
Schedule for when clients should download consensuses from fallback
@@ -1602,7 +1602,7 @@ The following options are useful only for clients (that is, if
[[ClientBootstrapConsensusMaxInProgressTries]] **ClientBootstrapConsensusMaxInProgressTries** __NUM__::
Try this many simultaneous connections to download a consensus before
- waiting for one to complete, timeout, or error out. (Default: 4)
+ waiting for one to complete, timeout, or error out. (Default: 3)
SERVER OPTIONS
--------------
@@ -2541,7 +2541,7 @@ The following options are used for running a testing Tor network.
[[TestingBridgeDownloadSchedule]] **TestingBridgeDownloadSchedule** __N__,__N__,__...__::
Schedule for when clients should download bridge descriptors. Changing this
- requires that **TestingTorNetwork** is set. (Default: 3600, 900, 900, 3600)
+ requires that **TestingTorNetwork** is set. (Default: 1200, 900, 900, 3600)
[[TestingClientMaxIntervalWithoutRequest]] **TestingClientMaxIntervalWithoutRequest** __N__ **seconds**|**minutes**::
When directory clients have only a few descriptors to request, they batch