commit 305934c67b919b7ab16270e4c75531f5e0de7210 Author: swati swati.thacker@oracle.com Date: Fri Feb 7 16:36:09 2020 +0530
Updated introductory text for CIRCUIT TIMEOUT and DORMANT MODE options --- doc/tor.1.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 73f9dd385..a9b9852b7 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