Merge branch 'ticket22029_attempt_squashed'

This commit is contained in:
Nick Mathewson
2020-01-09 15:27:32 -05:00
7 changed files with 515 additions and 77 deletions
+8 -7
View File
@@ -3623,13 +3623,14 @@ __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 of
routers by their identity fingerprint. Each line lists a status and a
fingerprint separated by whitespace. See your **`fingerprint`** file in the
__DataDirectory__ for an example line. If the status is **!reject**, then
the descriptors from the given identity (fingerprint) are rejected by this
server. If it is **!invalid**, then the descriptors are accepted but marked
in the directory as not valid, that is, not recommended.
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.
__DataDirectory__/**`v3-status-votes`**::
Only for v3 authoritative directory servers. This file contains status