diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-12-13 08:26:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-12-13 08:26:10 -0500 |
| commit | 69264f96f3561c72d14c1e518ca84ad18557d905 (patch) | |
| tree | 510c4795aa9116cd179ae7ad1652fd5e6cec0aa4 /doc/tor.1.txt | |
| parent | e17dd46cfdb33299db71a052840f069a364c85fe (diff) | |
| parent | e3b7fd2a8129f0d2a7879976e57496b6fd4a7d00 (diff) | |
| download | tor-69264f96f3561c72d14c1e518ca84ad18557d905.tar.gz tor-69264f96f3561c72d14c1e518ca84ad18557d905.zip | |
Merge branch 'dormant_persist_squashed'
Diffstat (limited to 'doc/tor.1.txt')
| -rw-r--r-- | doc/tor.1.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5b73e25e16..8c419b1a63 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1809,11 +1809,20 @@ The following options are useful only for clients (that is, if Does not affect servers or onion services. Must be at least 10 minutes. (Default: 24 hours) -[[DormantTimeoutDisabledByIdleStreams]] **DormantTimeoutDisabledByIdleStreams **0**|**1**:: +[[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) +[[DormantOnFirstStartup]] **DormantOnFirstStartup** **0**|**1**:: + If true, then the first time Tor starts up with a fresh DataDirectory, + it starts in dormant mode, and takes no actions until the user has made + a request. (This mode is recommended if installing a Tor client for a + user who might not actually use it.) If false, Tor bootstraps the first + time it is started, whether it sees a user request or not. + + + After the first time Tor starts, it begins in dormant mode if it was + dormant before, and not otherwise. (Default: 0) SERVER OPTIONS -------------- |