aboutsummaryrefslogtreecommitdiff
path: root/doc/tor.1.txt
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-12-22 11:10:37 -0500
committerNick Mathewson <nickm@torproject.org>2015-12-22 11:10:37 -0500
commitb9596b8fdf5006d650bba0109e5614b5a387dbdf (patch)
treec7cb053acdb166be8e7c39056a233414bca6ea36 /doc/tor.1.txt
parent45f5e597517abedbf9d650428ac53f03f37089d8 (diff)
downloadtor-b9596b8fdf5006d650bba0109e5614b5a387dbdf.tar.gz
tor-b9596b8fdf5006d650bba0109e5614b5a387dbdf.zip
document minimum heartbeatperiod; bug 15638.
Diffstat (limited to 'doc/tor.1.txt')
-rw-r--r--doc/tor.1.txt3
1 files changed, 2 insertions, 1 deletions
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