commit 34baa1bdc38f95a784789b8b0244bab81f9a36af Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 9 14:08:15 2020 -0500

Tweak the documentation for approved-routers

Document !badexit, and improve the documentation for !invalid.

Closes #40188. --- changes/ticket40188 | 4 ++++ doc/man/tor.1.txt | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/changes/ticket40188 b/changes/ticket40188 new file mode 100644 index 0000000000..e29b2a9438 --- /dev/null +++ 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 index ab273925b1..58774e555f 100644 --- 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