diff options
author | Nick Mathewson <nickm@torproject.org> | 2015-12-22 11:10:37 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-12-22 11:10:37 -0500 |
commit | b9596b8fdf5006d650bba0109e5614b5a387dbdf (patch) | |
tree | c7cb053acdb166be8e7c39056a233414bca6ea36 | |
parent | 45f5e597517abedbf9d650428ac53f03f37089d8 (diff) | |
download | tor-b9596b8fdf5006d650bba0109e5614b5a387dbdf.tar.gz tor-b9596b8fdf5006d650bba0109e5614b5a387dbdf.zip |
document minimum heartbeatperiod; bug 15638.
-rw-r--r-- | changes/bug15638 | 2 | ||||
-rw-r--r-- | doc/tor.1.txt | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug15638 b/changes/bug15638 new file mode 100644 index 0000000000..cf5d46983f --- /dev/null +++ b/changes/bug15638 @@ -0,0 +1,2 @@ + o Documentation: + - Document the minimum HeartbeatPeriod value. Closes ticket 15638. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 021353dcb0..3514c4d409 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1750,7 +1750,8 @@ is non-zero): Log a heartbeat message every **HeartbeatPeriod** seconds. This is a log level __notice__ message, designed to let you know your Tor server is still alive and doing useful things. Settings this - to 0 will disable the heartbeat. (Default: 6 hours) + to 0 will disable the heartbeat. Otherwise, it must be at least 30 + minutes. (Default: 6 hours) [[AccountingMax]] **AccountingMax** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**KBits**|**MBits**|**GBits**|**TBytes**:: Limits the max number of bytes sent and received within a set time period |