summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2020-03-10 09:14:44 -0400
committerDavid Goulet <dgoulet@torproject.org>2020-03-10 09:14:44 -0400
commit05aab3fd21b5f8a3165a58052a6af74a269bdeb6 (patch)
treeb960f52c6d123de1c1012260bd903c269c852c43 /doc
parent2d53168511eafe6ac28c38d3a6f95114af3ee7b3 (diff)
parent72550c18c82fe7bafaf01a539fc9ef0f0dbf5e75 (diff)
downloadtor-05aab3fd21b5f8a3165a58052a6af74a269bdeb6.tar.gz
tor-05aab3fd21b5f8a3165a58052a6af74a269bdeb6.zip
Merge branch 'maint-0.4.3'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 034fb7142d..dfc7aa9d4c 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -760,6 +760,11 @@ forward slash (/) in the configuration file and on the command line.
This setting will be ignored for connections to the loopback
addresses (127.0.0.0/8 and ::1).
+[[OwningControllerProcess]] **{dbl_}OwningControllerProcess** __PID__::
+ Make Tor instance periodically check for presence of a controller process
+ with given PID and terminate itself if this process is no longer alive.
+ Polling interval is 15 seconds.
+
[[PerConnBWBurst]] **PerConnBWBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
If this option is set manually, or via the "perconnbwburst" consensus
field, Tor will use it for separate rate limiting for each connection