diff options
| author | Alexander Færøy <ahf@torproject.org> | 2020-12-16 20:29:03 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2020-12-16 20:29:03 +0000 |
| commit | 7998ea2f18dafc283b6fa6e66056d07d4f5963d3 (patch) | |
| tree | c8bf37cca779335f9ab3639c7019f3ccea37adbe | |
| parent | 4a77aa6e8248f06e17a9a7375076b9d685a6b789 (diff) | |
| parent | 34baa1bdc38f95a784789b8b0244bab81f9a36af (diff) | |
| download | tor-7998ea2f18dafc283b6fa6e66056d07d4f5963d3.tar.gz tor-7998ea2f18dafc283b6fa6e66056d07d4f5963d3.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/237' into maint-0.4.5
| -rw-r--r-- | changes/ticket40188 | 4 | ||||
| -rw-r--r-- | 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 |