diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-08-16 22:00:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-08-16 22:00:14 -0400 |
| commit | 28485d33ca64ee3989f6993a1c30f265be9e324f (patch) | |
| tree | 97007fe21aac32d14bcbcfa2320182478166e9ae /doc | |
| parent | ca6949ebea5e811f4cf08108c237d836c4566a61 (diff) | |
| parent | edaea773e57cc39e892643bcce12c755810f508b (diff) | |
| download | tor-28485d33ca64ee3989f6993a1c30f265be9e324f.tar.gz tor-28485d33ca64ee3989f6993a1c30f265be9e324f.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8bc15d9c2e..ec00c093a2 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1540,7 +1540,7 @@ 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 + 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) |