summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-09-01 10:22:24 -0400
committerNick Mathewson <nickm@torproject.org>2015-09-04 09:55:07 -0400
commit0ba4e0895ae2395a528aacd1625715a7ffc29211 (patch)
tree998c4aa45c25327adf8db702433c04ab9d053b9e /doc
parentd891e2a9c517e2b097456b7143f955ac66b112ea (diff)
downloadtor-0ba4e0895ae2395a528aacd1625715a7ffc29211.tar.gz
tor-0ba4e0895ae2395a528aacd1625715a7ffc29211.zip
Add "OfflineMasterKey" option
When this is set, and Tor is running as a relay, it will not generate or load its secret identity key. You can manage the secret identity key with --keygen. Implements ticket 16944.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index af99570bd4..e34b19ed66 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1877,6 +1877,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
------------------------