aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorswati <swati.thacker@oracle.com>2020-02-07 16:36:09 +0530
committerswati <swati.thacker@oracle.com>2020-02-07 16:36:09 +0530
commit305934c67b919b7ab16270e4c75531f5e0de7210 (patch)
treedd5f49a741d50b3a5bf2f7f37ddea36cec925987 /doc
parent05adecf2115fe8e95a888a6ad5cdc0322181a332 (diff)
downloadtor-305934c67b919b7ab16270e4c75531f5e0de7210.tar.gz
tor-305934c67b919b7ab16270e4c75531f5e0de7210.zip
Updated introductory text for CIRCUIT TIMEOUT and DORMANT MODE options
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 73f9dd3852..a9b9852b7d 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1737,7 +1737,8 @@ The following options are useful only for clients (that is, if
// These options are in alphabetical order, with exceptions as noted.
// Please keep them that way!
-The following options are useful for configuring timeouts:
+The following options are useful for configuring timeouts related
+to building Tor circuits and using them:
[[CircuitsAvailableTimeout]] **CircuitsAvailableTimeout** __NUM__::
Tor will attempt to keep at least one open, unused circuit available for
@@ -1776,8 +1777,8 @@ The following options are useful for configuring timeouts:
// These options are in alphabetical order, with exceptions as noted.
// Please keep them that way!
-The following options can be used to configure Tor
-when the client is running in dormant mode:
+Tor can enter dormant mode to conserve power and network bandwidth.
+The following options control when Tor enters and leaves dormant mode:
[[DormantCanceledByStartup]] **DormantCanceledByStartup** **0**|**1**::
By default, Tor starts in active mode if it was active the last time