Merge branch 'maint-0.4.3'

This commit is contained in:
teor 2020-04-03 14:44:34 +10:00
commit 442e0caea2
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A

View File

@ -3715,14 +3715,15 @@ __DataDirectory__/**`hashed-fingerprint`**::
identity key. (That is, the hash of the hash of the identity key.) identity key. (That is, the hash of the hash of the identity key.)
__DataDirectory__/**`approved-routers`**:: __DataDirectory__/**`approved-routers`**::
Only used by authoritative directory servers. This file lists the status Only used by authoritative directory servers. Each line lists a status and
and a fingerprint/pubkey. Each line lists a status and a fingerprint an identity, separated by whitespace. Identities can be hex-encoded RSA
separated by whitespace. See your **fingerprint** file in the fingerprints, or base-64 encoded ed25519 public keys. See the
__DataDirectory__ for an example fingerprint line. If the status is **fingerprint** file in a tor relay's __DataDirectory__ for an example
**!reject** then descriptors from the given identity (fingerprint/pubkey) fingerprint line. If the status is **!reject**, then descriptors from the
are rejected by this server. If it is **!invalid** then descriptors are given identity are rejected by this server. If it is **!invalid** then
accepted but marked in the directory as not valid, that is, not descriptors are accepted, but marked in the directory as not valid, that
recommended. is, not recommended. In either case, the corresponding relays are not
included in the consensus.
__DataDirectory__/**`v3-status-votes`**:: __DataDirectory__/**`v3-status-votes`**::
Only for v3 authoritative directory servers. This file contains status Only for v3 authoritative directory servers. This file contains status