diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-03-17 11:53:14 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-03-17 11:53:14 -0400 |
| commit | 15a95df376f8b8e27072db8d36f28b7054d13cef (patch) | |
| tree | f5aac5cd56451b2562e5290aa76300e0855fdab3 /doc | |
| parent | 0ac03390e482a7ff1008f0051ac647114ce00c09 (diff) | |
| parent | 066748c9cde058db4c12dec0675c036ac11d7e84 (diff) | |
| download | tor-15a95df376f8b8e27072db8d36f28b7054d13cef.tar.gz tor-15a95df376f8b8e27072db8d36f28b7054d13cef.zip | |
Merge branch 'tor-gitlab/mr/337'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man/tor.1.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index f5dd1ec6f7..a8436f7446 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -1879,6 +1879,12 @@ The following options control when Tor enters and leaves dormant mode: counts as client activity for the purpose of DormantClientTimeout. If false, then only network activity counts. (Default: 1) +[[DormantTimeoutEnabled]] **DormantTimeoutEnabled** **0**|**1**:: + If false, then no amount of time without activity is sufficient to + make Tor go dormant. Setting this option to zero is only recommended for + special-purpose applications that need to use the Tor binary for + something other than sending or receiving Tor traffic. (Default: 1) + == NODE SELECTION OPTIONS // These options are in alphabetical order, with exceptions as noted. |