diff options
author | teor <teor@torproject.org> | 2020-04-03 14:44:34 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2020-04-03 14:44:34 +1000 |
commit | 442e0caea2910b43616560e8d95cd4138c377257 (patch) | |
tree | d3c79d8bec0e9095db9f8d0dc934c500e8da2436 /doc | |
parent | 6fbb9af96c84bca6f15829172cb75504ca9e5682 (diff) | |
parent | 7d2b6cacee75c5eeb27801151a175a0816fff129 (diff) | |
download | tor-442e0caea2910b43616560e8d95cd4138c377257.tar.gz tor-442e0caea2910b43616560e8d95cd4138c377257.zip |
Merge branch 'maint-0.4.3'
Diffstat (limited to 'doc')
-rw-r--r-- | doc/tor.1.txt | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ba9b9bb5e0..5b55b39d47 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -3715,14 +3715,15 @@ __DataDirectory__/**`hashed-fingerprint`**:: identity key. (That is, the hash of the hash of the identity key.) __DataDirectory__/**`approved-routers`**:: - Only used by authoritative directory servers. This file lists the status - and a fingerprint/pubkey. Each line lists a status and a fingerprint - separated by whitespace. See your **fingerprint** file in the - __DataDirectory__ for an example fingerprint line. If the status is - **!reject** then descriptors from the given identity (fingerprint/pubkey) - are rejected by this server. If it is **!invalid** then descriptors are - accepted but marked in the directory as not valid, that is, not - recommended. + Only used by authoritative directory servers. Each line lists a status and + an identity, separated by whitespace. Identities can be hex-encoded RSA + fingerprints, or base-64 encoded ed25519 public keys. See the + **fingerprint** file in a tor relay's __DataDirectory__ for an example + fingerprint line. If the status is **!reject**, then descriptors from the + given identity are rejected by this server. If it is **!invalid** then + descriptors are accepted, but marked in the directory as not valid, that + is, not recommended. In either case, the corresponding relays are not + included in the consensus. __DataDirectory__/**`v3-status-votes`**:: Only for v3 authoritative directory servers. This file contains status |