diff options
| author | Roger Dingledine <arma@torproject.org> | 2013-03-09 17:16:11 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2013-03-10 23:38:18 -0400 |
| commit | edd6f02273c58bfe39a978dd5c7b8765aae0b886 (patch) | |
| tree | 967a5600dee954b899cb7e34da8467f1a0e425c3 /doc/tor.1.txt | |
| parent | 599aeef9bc9e707ec7146da79b2018bf2f2924b3 (diff) | |
| download | tor-edd6f02273c58bfe39a978dd5c7b8765aae0b886.tar.gz tor-edd6f02273c58bfe39a978dd5c7b8765aae0b886.zip | |
randomize SSLKeyLifetime by default
resolves ticket 8443.
Diffstat (limited to 'doc/tor.1.txt')
| -rw-r--r-- | doc/tor.1.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 75bca79378..505a0834b5 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1500,8 +1500,13 @@ is non-zero): **ShutdownWaitLength** __NUM__:: When we get a SIGINT and we're a server, we begin shutting down: we close listeners and start refusing new circuits. After **NUM** - seconds, we exit. If we get a second SIGINT, we exit immedi- - ately. (Default: 30 seconds) + seconds, we exit. If we get a second SIGINT, we exit immediately. + (Default: 30 seconds) + +**SSLKeyLifetime** __N__ **minutes**|**hours**|**days**|**weeks**:: + When creating a link certificate for our outermost SSL handshake, + set its lifetime to this amount of time. If set to 0, Tor will choose + some reasonable random defaults. (Default: 0) **HeartbeatPeriod** __N__ **minutes**|**hours**|**days**|**weeks**:: Log a heartbeat message every **HeartbeatPeriod** seconds. This is |