[tor-commits] [tor/release-0.2.8] minor touchups on nick's ticket 17621 changes
nickm at torproject.org
nickm at torproject.org
Thu May 12 19:35:51 UTC 2016
commit 4a62d7aabc4e00d22f27d188f4cb2bb6efb3b674
Author: Roger Dingledine <arma at torproject.org>
Date: Wed May 11 16:35:36 2016 -0400
minor touchups on nick's ticket 17621 changes
---
changes/doc17621 | 2 +-
doc/tor.1.txt | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/changes/doc17621 b/changes/doc17621
index af61d81..ab37d29 100644
--- a/changes/doc17621
+++ b/changes/doc17621
@@ -1,3 +1,3 @@
o Documentation:
- Document the contents of the 'datadir/keys' subdirectory in the manual
- page. Closes ticekt 17621.
+ page. Closes ticket 17621.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 5d85935..74915b7 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,
More information about the tor-commits
mailing list