diff options
author | teor <teor2345@gmail.com> | 2017-08-29 14:04:24 +1000 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-09-12 10:38:25 -0400 |
commit | 97249c4f5e389141cb4ff3562a3813bd09bff6ad (patch) | |
tree | fea0d8ade7b106af53d5a389b56ce9867b7083da /doc | |
parent | 435952538da2d99e7ce46f510ac3f7dc3f910fca (diff) | |
download | tor-97249c4f5e389141cb4ff3562a3813bd09bff6ad.tar.gz tor-97249c4f5e389141cb4ff3562a3813bd09bff6ad.zip |
Make bridge clients download bridge descriptors immediately
The download schedule tells Tor to wait 15 minutes before downloading
bridge descriptors. But 17750 made Tor ignore that and start immediately.
Since we fixed 17750, Tor waits 15 minutes for bridge client bootstrap,
like the schedule says.
This fixes the download schedule to start immediately, and to try each
bridge 3 times in the first 30 seconds. This should make bridge bootstraps
more reliable.
Fixes 23347.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/tor.1.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 9949f9dd0e..e3939d115a 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2475,7 +2475,7 @@ The following options are used for running a testing Tor network. TestingClientDownloadSchedule 0, 0, 5, 10, 15, 20, 30, 60 TestingServerConsensusDownloadSchedule 0, 0, 5, 10, 15, 20, 30, 60 TestingClientConsensusDownloadSchedule 0, 0, 5, 10, 15, 20, 30, 60 - TestingBridgeDownloadSchedule 60, 30, 30, 60 + TestingBridgeDownloadSchedule 0, 5, 10, 30, 60 TestingClientMaxIntervalWithoutRequest 5 seconds TestingDirConnectionMaxStall 30 seconds TestingConsensusMaxDownloadTries 80 @@ -2541,7 +2541,8 @@ 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: 1200, 900, 900, 3600) + requires that **TestingTorNetwork** is set. (Default: 0, 8, 3600, 10800, + 25200, 54000, 111600, 262800) [[TestingClientMaxIntervalWithoutRequest]] **TestingClientMaxIntervalWithoutRequest** __N__ **seconds**|**minutes**:: When directory clients have only a few descriptors to request, they batch |