diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-09 15:27:32 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-09 15:27:32 -0500 |
| commit | 93894fb770afbbea9850e850ff9e1bb23d7cc4e1 (patch) | |
| tree | f06bb96a46f4602319b44af56fa31a82bf29fdd8 /doc | |
| parent | e45810113b150533611c7d9cb5f0f264e00a7394 (diff) | |
| parent | 686c5e90a31c6a47a6b3ef6946fc2019b2015c78 (diff) | |
| download | tor-93894fb770afbbea9850e850ff9e1bb23d7cc4e1.tar.gz tor-93894fb770afbbea9850e850ff9e1bb23d7cc4e1.zip | |
Merge branch 'ticket22029_attempt_squashed'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index e1738c9ba3..df74721a39 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -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 |