commit 7998ea2f18dafc283b6fa6e66056d07d4f5963d3
parent 4a77aa6e8248f06e17a9a7375076b9d685a6b789
Author: Alexander Færøy <ahf@torproject.org>
Date: Wed, 16 Dec 2020 20:29:03 +0000
Merge remote-tracking branch 'tor-gitlab/mr/237' into maint-0.4.5
Diffstat:
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/changes/ticket40188 b/changes/ticket40188
@@ -0,0 +1,4 @@
+ o Minor features (documentation):
+ - Mention the !badexit directive that can appear in an authority's
+ approved-routers file, and update the description of the !invalid
+ directive. Closes ticket 40188.
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
@@ -3824,9 +3824,11 @@ __DataDirectory__/**`approved-routers`**::
**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.
+ descriptors are accepted, but marked in the vote as not valid.
+ If it is **!badexit**, then the authority will vote for it to receive a
+ BadExit flag, indicating that it shouldn't be used for traffic leaving
+ the Tor network.
+ (Neither rejected nor invalid relays are included in the consensus.)
__DataDirectory__/**`v3-status-votes`**::
Only for v3 authoritative directory servers. This file contains status
