diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-09-22 09:19:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-09-22 09:19:28 -0400 |
| commit | e94ef30a2fa6ef0197fe9fafbb2469475d868627 (patch) | |
| tree | b6ff0db12c54fe874a640d439a9d508d00bad31c /doc | |
| parent | 2a9650625f5ce2cbad67299ce57c92bc70677a9b (diff) | |
| parent | d70b1b4da13d30f16ba0604103a1ebe915a2a20a (diff) | |
| download | tor-e94ef30a2fa6ef0197fe9fafbb2469475d868627.tar.gz tor-e94ef30a2fa6ef0197fe9fafbb2469475d868627.zip | |
Merge branch 'feature16944_v2'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 6fab7f26f8..14b13bc09e 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1906,6 +1906,11 @@ is non-zero): configures their lifetime. (Default: 30 days) +[[OfflineMasterKey]] **OfflineMasterKey** **0**|**1**:: + If non-zero, the Tor relay will never generate or load its master secret + key. Instead, you'll have to use "tor --keygen" to manage the master + secret key. (Default: 0) + DIRECTORY SERVER OPTIONS ------------------------ |