diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-27 12:45:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-27 12:45:07 -0400 |
| commit | 346c2eb4e60299f69327b5e63e1e25aaf678f964 (patch) | |
| tree | 110b6b0cecccecb62c6c0c917922e0f51dbce870 /doc/tor.1.txt | |
| parent | 8b58e1e323e362463906d2576b9d2b9e788c2f30 (diff) | |
| parent | d00ed406e08942d6539281eb28e875939ee214e5 (diff) | |
| download | tor-346c2eb4e60299f69327b5e63e1e25aaf678f964.tar.gz tor-346c2eb4e60299f69327b5e63e1e25aaf678f964.zip | |
Merge branch 'bug25843_v2_squashed'
Diffstat (limited to 'doc/tor.1.txt')
| -rw-r--r-- | doc/tor.1.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index cf666e9142..34ec866b13 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1347,6 +1347,13 @@ The following options are useful only for clients (that is, if number from the guard-n-primary-guards-to-use consensus parameter, and default to 1 if the consensus parameter isn't set. (Default: 0) +[[NumPrimaryGuards]] **NumPrimaryGuards** __NUM__:: + If UseEntryGuards is set to 1, we will try to pick NUM routers for our + primary guard list, which is the set of routers we strongly prefer when + connecting to the Tor network. If NUM is 0, we try to learn the number from + the guard-n-primary-guards consensus parameter, and default to 3 if the + consensus parameter isn't set. (Default: 0) + [[NumDirectoryGuards]] **NumDirectoryGuards** __NUM__:: If UseEntryGuards is set to 1, we try to make sure we have at least NUM routers to use as directory guards. If this option is set to 0, use the |