summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2016-05-11 16:35:36 -0400
committerRoger Dingledine <arma@torproject.org>2016-05-11 16:35:36 -0400
commit4a62d7aabc4e00d22f27d188f4cb2bb6efb3b674 (patch)
tree18b4ef5d153cd469c6e6185b4041422dd5f95491 /doc
parentaf4b7d040507a69614fdb526e098a9295acc6c1f (diff)
downloadtor-4a62d7aabc4e00d22f27d188f4cb2bb6efb3b674.tar.gz
tor-4a62d7aabc4e00d22f27d188f4cb2bb6efb3b674.zip
minor touchups on nick's ticket 17621 changes
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt11
1 files changed, 5 insertions, 6 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 5d85935727..74915b7119 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2703,18 +2703,18 @@ __DataDirectory__**/keys/***::
Only used by servers. Holds identity keys and onion keys.
__DataDirectory__**/keys/authority_identity_key**::
- A directory authority's master identity key, used to authenticate its
+ A v3 directory authority's master identity key, used to authenticate its
signing key. Tor doesn't use this while it's running. The tor-gencert
program uses this. If you're running an authority, you should keep this
key offline, and not actually put it here.
__DataDirectory__**/keys/authority_certificate**::
- A directory authority's certificate, which authenticates the authority's
+ A v3 directory authority's certificate, which authenticates the authority's
current vote- and consensus-signing key using its master identity key.
Only directory authorities use this file.
__DataDirectory__**/keys/authority_signing_key**::
- A directory authority's signing key, used to sign votes and consensuses.
+ A v3 directory authority's signing key, used to sign votes and consensuses.
Only directory authorities use this file. Corresponds to the
**authority_certificate** cert.
@@ -2765,9 +2765,8 @@ __DataDirectory__**/hashed-fingerprint**::
identity key. (That is, the hash of the hash of the identity key.)
__DataDirectory__**/v3-status-votes**::
- Only for authoritative directory servers. This file contains status votes
- from all the authoritative directory servers and is used to generate the
- network consensus document.
+ Only for v3 authoritative directory servers. This file contains
+ status votes from all the authoritative directory servers.
__DataDirectory__**/unverified-consensus**::
This file contains a network consensus document that has been downloaded,