summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-16 14:26:21 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-16 14:26:50 -0400
commita73d0fe9a87df762474ee928ff9e6282e5e38430 (patch)
tree1dac74ab6f5d821dab3052ab9e1924952b057dee /doc
parent80ad374b8457e4c92f88f8a89376a8ca87231c9c (diff)
downloadtor-a73d0fe9a87df762474ee928ff9e6282e5e38430.tar.gz
tor-a73d0fe9a87df762474ee928ff9e6282e5e38430.zip
Document key-pinning-journal
Closes 22347
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 5e0a71ca26..7544c03f97 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2741,6 +2741,13 @@ __DataDirectory__**/lock**::
directory. If access to this file is locked, data directory is already
in use by Tor.
+__DataDirectory__**/key-pinning-journal**::
+ Used by authorities. A line-based file that records mappings between
+ RSA1024 identity keys and Ed25519 identity keys. Authorities enforce
+ these mappings, so that once a relay has picked an Ed25519 key, stealing
+ or factoring the RSA1024 key will no longer let an attacker impersonate
+ the relay.
+
__DataDirectory__**/keys/***::
Only used by servers. Holds identity keys and onion keys.