diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-26 16:33:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-26 16:33:31 -0500 |
| commit | 7d8e0cc9abf2a74789e635d2fd4d0e18b8e0d1fe (patch) | |
| tree | 0ac25bf4798d16765392039a43db7b878a46b293 /doc/tor.1.txt | |
| parent | 2b9a907bdccc588203d2110866d4e7bb72a25773 (diff) | |
| parent | 02843c4a4e2fab9c5d9cdb95c425c37ff3d1a4ae (diff) | |
| download | tor-7d8e0cc9abf2a74789e635d2fd4d0e18b8e0d1fe.tar.gz tor-7d8e0cc9abf2a74789e635d2fd4d0e18b8e0d1fe.zip | |
Merge branch 'dormant_v2_squashed'
Diffstat (limited to 'doc/tor.1.txt')
| -rw-r--r-- | doc/tor.1.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index c951b63395..e94382b66b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1790,6 +1790,19 @@ The following options are useful only for clients (that is, if Try this many simultaneous connections to download a consensus before waiting for one to complete, timeout, or error out. (Default: 3) +[[DormantClientTimeout]] **DormantClientTimeout** __N__ **minutes**|**hours**|**days**|**weeks**:: + If Tor spends this much time without any client activity, + enter a dormant state where automatic circuits are not built, and + directory information is not fetched. + Does not affect servers or onion services. Must be at least 10 minutes. + (Default: 24 hours) + +[[DormantTimeoutDisabledByIdleStreams]] **DormantTimeoutDisabledByIdleStreams **0**|**1**:: + If true, then any open client stream (even one not reading or writing) + counts as client activity for the purpose of DormantClientTimeout. + If false, then only network activity counts. (Default: 1) + + SERVER OPTIONS -------------- |