nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tor-github/pr/1381'

Browse Source
This commit is contained in:
David Goulet 2019-10-08 14:49:39 -04:00
commit 1f60337da4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket31189 Normal file
View File

@ -0,0 +1,3 @@
o Documentation:
- Correct the description of "GuardLifetime". Fixes bug 31189; bugfix on
0.3.0.1-alpha.

7
doc/tor.1.txt
View File

@ -1468,10 +1468,9 @@ The following options are useful only for clients (that is, if
default to 3 if the consensus parameter isn't set. (Default: 0) default to 3 if the consensus parameter isn't set. (Default: 0)
[[GuardLifetime]] **GuardLifetime** __N__ **days**|**weeks**|**months**:: [[GuardLifetime]] **GuardLifetime** __N__ **days**|**weeks**|**months**::
If nonzero, and UseEntryGuards is set, minimum time to keep a guard before If UseEntryGuards is set, minimum time to keep a guard on our guard list
picking a new one. If zero, we use the GuardLifetime parameter from the before picking a new one. If less than one day, we use defaults from the
consensus directory. No value here may be less than 1 month or greater consensus directory. (Default: 0)
than 5 years; out-of-range values are clamped. (Default: 0)
[[SafeSocks]] **SafeSocks** **0**|**1**:: [[SafeSocks]] **SafeSocks** **0**|**1**::
When this option is enabled, Tor will reject application connections that When this option is enabled, Tor will reject application connections that