summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-11-15 13:16:58 -0500
committerNick Mathewson <nickm@torproject.org>2018-11-26 16:32:40 -0500
commit3743f7969587079a2f2bb03d0b7e5038557fd64a (patch)
treeaf8e96b1be0384be223e96167065e76e96922727 /doc
parent53ccdb6945f0d4a9b27a9939211a3c9125ca4427 (diff)
downloadtor-3743f7969587079a2f2bb03d0b7e5038557fd64a.tar.gz
tor-3743f7969587079a2f2bb03d0b7e5038557fd64a.zip
Add options to control dormant-client feature.
The DormantClientTimeout option controls how long Tor will wait before going dormant. It also provides a way to disable the feature by setting DormantClientTimeout to e.g. "50 years". The DormantTimeoutDisabledByIdleStreams option controls whether open but inactive streams count as "client activity". To implement it, I had to make it so that reading or writing on a client stream *always* counts as activity. Closes ticket 28429.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt13
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index b147ad68aa..47bddea097 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1789,6 +1789,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
--------------