diff options
| author | Alexander Færøy <ahf@torproject.org> | 2020-12-16 20:29:19 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2020-12-16 20:29:19 +0000 |
| commit | 2d68fdc94c78906c393f51661429575033362701 (patch) | |
| tree | 87214cf23ed3c1fc737c5ecb14fa744d5039cfe8 /doc/man | |
| parent | 8b2d32435d626d878ddeb2348262d3efcdae8cbf (diff) | |
| parent | 7998ea2f18dafc283b6fa6e66056d07d4f5963d3 (diff) | |
| download | tor-2d68fdc94c78906c393f51661429575033362701.tar.gz tor-2d68fdc94c78906c393f51661429575033362701.zip | |
Merge branch 'maint-0.4.5'
Diffstat (limited to 'doc/man')
| -rw-r--r-- | doc/man/tor.1.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index e886d6f801..0cfda9482b 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -3825,9 +3825,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 |