diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-02-28 15:22:56 +0100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-02-28 15:22:56 +0100 |
| commit | c6858cb5fe3c956b9413a29717071bdd1a28b3dd (patch) | |
| tree | d2fa678d468541f07c4be5b758611e991bd67718 | |
| parent | 57699de005b2033a1886cecf7a1ed17e2bf95b81 (diff) | |
| parent | af88e8f23742c810f478410fba60c43812dde85d (diff) | |
| download | tor-c6858cb5fe3c956b9413a29717071bdd1a28b3dd.tar.gz tor-c6858cb5fe3c956b9413a29717071bdd1a28b3dd.zip | |
Merge remote-tracking branch 'teor/bug17193'
| -rw-r--r-- | doc/tor.1.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 250ed67a04..d6a68523df 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2482,6 +2482,11 @@ The following options are used for running a testing Tor network. fallback directory mirrors before giving up. Changing this requires that **TestingTorNetwork** is set. (Default: 7) +[[TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries]] **TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries** __NUM__:: + Try this many times to download a consensus while bootstrapping using + authorities before giving up. Changing this requires that + **TestingTorNetwork** is set. (Default: 4) + [[TestingClientBootstrapConsensusMaxInProgressTries]] **TestingClientBootstrapConsensusMaxInProgressTries** __NUM__:: Try this many simultaneous connections to download a consensus before waiting for one to complete, timeout, or error out. Changing this |