Commit 2d68fdc9 authored by Alexander Hansen Færøy's avatar Alexander Hansen Færøy
Browse files

Merge branch 'maint-0.4.5'

parents 8b2d3243 7998ea2f

changes/ticket40188

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  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.

doc/man/tor.1.txt

+5 −3
Original line number Diff line number Diff line
@@ -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