aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2014-09-04 23:16:51 +0200
committerNick Mathewson <nickm@torproject.org>2014-09-09 11:50:21 -0400
commit607724c696a6e1bb10c8a955dac38f0ea947ce34 (patch)
tree126d7b64ea14a844b110c5e4b0ee9a0c848aaaa4 /doc
parent835672166255fd090a2fb92ccf48ec0cfd8779b7 (diff)
downloadtor-607724c696a6e1bb10c8a955dac38f0ea947ce34.tar.gz
tor-607724c696a6e1bb10c8a955dac38f0ea947ce34.zip
Remove support for naming directory authorities
This implements the meat of #12899. This commit should simply remove the parts of Tor dirauths used to check whether a relay was supposed to be named or not, it doesn't yet convert to a new mechanism for reject/invalid/baddir/badexiting relays.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt19
1 files changed, 0 insertions, 19 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 3284b94ea8..27fc6bb591 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1845,15 +1845,6 @@ on the public Tor network.
authorities provide this service optionally. See **RecommendedVersions**,
**RecommendedClientVersions**, and **RecommendedServerVersions**.
-[[NamingAuthoritativeDirectory]] **NamingAuthoritativeDirectory** **0**|**1**::
- When this option is set to 1, then the server advertises that it has
- opinions about nickname-to-fingerprint bindings. It will include these
- opinions in its published network-status pages, by listing servers with
- the flag "Named" if a correct binding between that nickname and fingerprint
- has been registered with the dirserver. Naming dirservers will refuse to
- accept or publish descriptors that contradict a registered binding. See
- **approved-routers** in the **FILES** section below.
-
[[RecommendedVersions]] **RecommendedVersions** __STRING__::
STRING is a comma-separated list of Tor versions currently believed to be
safe. The list is included in each directory, and nodes which pull down the
@@ -2350,16 +2341,6 @@ __DataDirectory__**/hashed-fingerprint**::
Only used by bridges. Holds the hashed fingerprint of the bridge's
identity key. (That is, the hash of the hash of the identity key.)
-__DataDirectory__**/approved-routers**::
- Only for naming authoritative directory servers (see
- **NamingAuthoritativeDirectory**). This file lists nickname to identity
- bindings. Each line lists a nickname and a fingerprint separated by
- whitespace. See your **fingerprint** file in the __DataDirectory__ for an
- example line. If the nickname is **!reject** then descriptors from the
- given identity (fingerprint) 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.
-
__DataDirectory__**/v3-status-votes**::
Only for authoritative directory servers. This file contains status votes
from all the authoritative directory servers and is used to generate the