summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDamian Johnson <atagar@torproject.org>2015-11-23 18:27:17 -0800
committerDamian Johnson <atagar@torproject.org>2015-11-23 18:27:17 -0800
commit8661b4b5a2664f2bcda36d51371c0e141be497bd (patch)
treeabee12b711fbf1b7484c48f444e4e9415d5499e8 /doc
parentfeeb3e761cafe0c3a5c0c8be58df54f1cde2fcdb (diff)
downloadtor-8661b4b5a2664f2bcda36d51371c0e141be497bd.tar.gz
tor-8661b4b5a2664f2bcda36d51371c0e141be497bd.zip
Drop HidServDirectoryV2 and VoteOnHidServDirectoriesV2
These options were removed from tor in July. Time to axe them from our man page. :P https://gitweb.torproject.org/tor.git/commit/?id=2f8cf524ba4e565ab613504a4c41fd724d32facc
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt12
1 files changed, 1 insertions, 11 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 4daac3e26e..7f6d91dae4 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1936,11 +1936,6 @@ if DirPort is non-zero):
to set up a separate webserver. There's a sample disclaimer in
contrib/operator-tools/tor-exit-notice.html.
-[[HidServDirectoryV2]] **HidServDirectoryV2** **0**|**1**::
- When this option is set, Tor accepts and serves v2 hidden service
- descriptors. Setting DirPort is not required for this, because clients
- connect via the ORPort by default. (Default: 1)
-
[[DirPort]] **DirPort** \['address':]__PORT__|**auto** [_flags_]::
If this option is nonzero, advertise the directory service on this port.
Set it to "auto" to have Tor pick a port for you. This option can occur
@@ -2152,11 +2147,6 @@ on the public Tor network.
that fine-grained information about nodes can be discarded when it hasn't
changed for a given amount of time. (Default: 24 hours)
-[[VoteOnHidServDirectoriesV2]] **VoteOnHidServDirectoriesV2** **0**|**1**::
- When this option is set in addition to **AuthoritativeDirectory**, Tor
- votes on whether to accept relays as hidden service directories.
- (Default: 1)
-
[[AuthDirHasIPv6Connectivity]] **AuthDirHasIPv6Connectivity** **0**|**1**::
Authoritative directories only. When set to 0, OR ports with an
IPv6 address are being accepted without reachability testing.
@@ -2420,7 +2410,7 @@ The following options are used for running a testing Tor network.
information on how to specify nodes.
+
In order for this option to have any effect, **TestingTorNetwork**
- and **VoteOnHidServDirectoriesV2** both have to be set.
+ must be set.
[[TestingDirAuthVoteHSDirIsStrict]] **TestingDirAuthVoteHSDirIsStrict** **0**|**1** ::
If True (1), a node will never receive the HSDir flag unless it is specified