aboutsummaryrefslogtreecommitdiff
path: root/doc/tor.1.txt
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@gmail.com>2010-12-01 03:32:42 +0200
committerNick Mathewson <nickm@torproject.org>2011-02-22 12:40:38 -0500
commitee95430d397d2382227cdeac8c678c7345df594d (patch)
treef946eeac09e632650c1b038ce6a203c4ab194a6d /doc/tor.1.txt
parent098b6ba72d636cf00cfa091e745c25a649fba493 (diff)
downloadtor-ee95430d397d2382227cdeac8c678c7345df594d.tar
tor-ee95430d397d2382227cdeac8c678c7345df594d.tar.gz
Implement more heartbeat message stuff.
(This squashes multiple commits: * Adds uptime monitoring support. * Adds circuit counting code. * Trivially tweaks the documentation. * Trivial run_scheduled_events() code tweaking. * Adds a status.h to export functions. * Added bandwidth monitoring code. * Added consensus presense detection code. * Restricts the precision of the bandwidth output. * Various fixes. * Fixed style and spacing problems. * Tidied up src/or/Makefile.am * Couple of minor fixes on status.c functions. * 'Implemented' client heartbeat support )
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 9020a8028..7ba530288 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -931,7 +931,8 @@ is non-zero):
**HeartbeatPeriod** __N__ **minutes**|**hours**|**days**|**weeks**::
Log a heartbeat message every **HeartbeatPeriod** seconds. This is
a log level __info__ message, designed to let you know your Tor
- instance is still alive and doing useful things. (Default: 6 hours)
+ server is still alive and doing useful things. Settings this
+ to 0 will disable the heartbeat. (Default: 6 hours)
**AccountingMax** __N__ **bytes**|**KB**|**MB**|**GB**|**TB**::
Never send more than the specified number of bytes in a given accounting