aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-09-30 14:50:57 -0400
committerNick Mathewson <nickm@torproject.org>2019-09-30 14:54:52 -0400
commit6581f3e2faf412357212b2ee2cec0db5410d3761 (patch)
treeae372e52b9944a7dc7b7b60299ab113f7ecd3e07 /doc
parent02840169d860384257042bdf6d7601c2bf48b47b (diff)
downloadtor-6581f3e2faf412357212b2ee2cec0db5410d3761.tar.gz
tor-6581f3e2faf412357212b2ee2cec0db5410d3761.zip
Fix the documentation for GuardLifetime.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 21b482802e..98ef7c7334 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1395,10 +1395,9 @@ The following options are useful only for clients (that is, if
default to 3 if the consensus parameter isn't set. (Default: 0)
[[GuardLifetime]] **GuardLifetime** __N__ **days**|**weeks**|**months**::
- If nonzero, and UseEntryGuards is set, minimum time to keep a guard before
- picking a new one. If zero, we use the GuardLifetime parameter from the
- consensus directory. No value here may be less than 1 month or greater
- than 5 years; out-of-range values are clamped. (Default: 0)
+ If UseEntryGuards is set, minimum time to keep a guard on our guard list
+ before picking a new one. If less than one day, we use defaults from the
+ consensus directory. (Default: 0)
[[SafeSocks]] **SafeSocks** **0**|**1**::
When this option is enabled, Tor will reject application connections that