diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-14 07:42:56 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-14 07:42:56 -0500 |
| commit | 586c3a7c902dfb6fdf52390ecb2a08d6fceef77a (patch) | |
| tree | e9380565d863f62ac2c47587bd0b87b290d47405 /doc | |
| parent | a6a7a1f3edd93bb3d9b328e6124e0912cdc94c7b (diff) | |
| parent | 9daf06d171035582c0fca3516f265a59fffc7bbf (diff) | |
| download | tor-586c3a7c902dfb6fdf52390ecb2a08d6fceef77a.tar.gz tor-586c3a7c902dfb6fdf52390ecb2a08d6fceef77a.zip | |
Merge branch 'maint-0.3.5'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 2f7a039cc4..b147ad68aa 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -635,9 +635,7 @@ GENERAL OPTIONS [[KeepalivePeriod]] **KeepalivePeriod** __NUM__:: To keep firewalls from expiring connections, send a padding keepalive cell - every NUM seconds on open connections that are in use. If the connection - has no open circuits, it will instead be closed after NUM seconds of - idleness. (Default: 5 minutes) + every NUM seconds on open connections that are in use. (Default: 5 minutes) [[Log]] **Log** __minSeverity__[-__maxSeverity__] **stderr**|**stdout**|**syslog**:: Send all messages between __minSeverity__ and __maxSeverity__ to the standard |