aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug156382
-rw-r--r--doc/tor.1.txt3
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