diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-06 13:28:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-06 13:28:10 -0500 |
| commit | 1f498220bda87e44d8a3ab12825270fde6eec7dc (patch) | |
| tree | faad108e8ad3cf63340766faaaeebb369127280a /doc | |
| parent | 48f734178362d3a8b490a23ceff202a2027a27fc (diff) | |
| parent | 42e31b5c45b5387d1c81067386373636bb8fd5c2 (diff) | |
| download | tor-1f498220bda87e44d8a3ab12825270fde6eec7dc.tar.gz tor-1f498220bda87e44d8a3ab12825270fde6eec7dc.zip | |
Merge remote-tracking branch 'tor-github/pr/1620'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index aad37204c9..85369dfcef 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -3256,7 +3256,6 @@ The following options are used for running a testing Tor network. TestingV3AuthInitialVoteDelay 20 seconds TestingV3AuthInitialDistDelay 20 seconds TestingAuthDirTimeToLearnReachability 0 minutes - TestingEstimatedDescriptorPropagationTime 0 minutes TestingServerDownloadInitialDelay 0 TestingClientDownloadInitialDelay 0 TestingServerConsensusDownloadInitialDelay 0 @@ -3292,11 +3291,6 @@ The following options are used for running a testing Tor network. are Running until this much time has passed. Changing this requires that **TestingTorNetwork** is set. (Default: 30 minutes) -[[TestingEstimatedDescriptorPropagationTime]] **TestingEstimatedDescriptorPropagationTime** __N__ **minutes**|**hours**:: - Clients try downloading server descriptors from directory caches after this - time. Changing this requires that **TestingTorNetwork** is set. (Default: - 10 minutes) - [[TestingMinFastFlagThreshold]] **TestingMinFastFlagThreshold** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: Minimum value for the Fast flag. Overrides the ordinary minimum taken from the consensus when TestingTorNetwork is set. (Default: 0.) |