diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-03-10 09:14:44 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-03-10 09:14:44 -0400 |
| commit | 05aab3fd21b5f8a3165a58052a6af74a269bdeb6 (patch) | |
| tree | b960f52c6d123de1c1012260bd903c269c852c43 | |
| parent | 2d53168511eafe6ac28c38d3a6f95114af3ee7b3 (diff) | |
| parent | 72550c18c82fe7bafaf01a539fc9ef0f0dbf5e75 (diff) | |
| download | tor-05aab3fd21b5f8a3165a58052a6af74a269bdeb6.tar.gz tor-05aab3fd21b5f8a3165a58052a6af74a269bdeb6.zip | |
Merge branch 'maint-0.4.3'
| -rw-r--r-- | changes/doc32971 | 3 | ||||
| -rw-r--r-- | doc/tor.1.txt | 5 | ||||
| -rw-r--r-- | src/lib/evloop/procmon.c | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/changes/doc32971 b/changes/doc32971 new file mode 100644 index 0000000000..014d2a7cec --- /dev/null +++ b/changes/doc32971 @@ -0,0 +1,3 @@ + o Documentation (manpage): + - Document __OwningControllerProcess torrc option and specify polling + interval. Resolves issue 32971. 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 diff --git a/src/lib/evloop/procmon.c b/src/lib/evloop/procmon.c index 3276cb1808..718c7d4777 100644 --- a/src/lib/evloop/procmon.c +++ b/src/lib/evloop/procmon.c @@ -165,8 +165,8 @@ tor_validate_process_specifier(const char *process_spec, return parse_process_specifier(process_spec, &ppspec, msg); } -/* DOCDOC poll_interval_tv */ -static const struct timeval poll_interval_tv = {15, 0}; +/* We check this often for presence of owning controller process. */ +static const struct timeval poll_interval_tv = {15, 0}; // 15 seconds. /** Create a process-termination monitor for the process specifier * given in <b>process_spec</b>. Return a newly allocated |