aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-11-29 12:51:50 +0000
committerRoger Dingledine <arma@torproject.org>2007-11-29 12:51:50 +0000
commitff981c8805c4a80a2896b32c08431fcabe865221 (patch)
tree5ba6581b3e6ff653d8876480fff8359291605282
parent4a08380ad738611bd1d5fd96166b0dcd21abe54c (diff)
downloadtor-ff981c8805c4a80a2896b32c08431fcabe865221.tar
tor-ff981c8805c4a80a2896b32c08431fcabe865221.tar.gz
doc fixes from karsten
svn:r12603
-rw-r--r--doc/spec/dir-spec.txt12
-rw-r--r--doc/tor.1.in5
2 files changed, 17 insertions, 0 deletions
diff --git a/doc/spec/dir-spec.txt b/doc/spec/dir-spec.txt
index 0e6343e6c..f47eb4f52 100644
--- a/doc/spec/dir-spec.txt
+++ b/doc/spec/dir-spec.txt
@@ -556,6 +556,13 @@ $Id$
it is prefixed with "opt"; it should be so prefixed until these
versions are obsolete.]
+ "hidden-service-dir" NL
+
+ [At most once.]
+
+ Present only if this router stores and serves v2 hidden service
+ descriptors.
+
2.2. Extra-info documents
Extra-info documents consist of the following items:
@@ -908,6 +915,7 @@ $Id$
circuits.
"Fast" if the router is suitable for high-bandwidth circuits.
"Guard" if the router is suitable for use as an entry guard.
+ "HSDir" if the router is considered a v2 hidden service directory.
"Named" if the router's identity-nickname mapping is canonical,
and this authority binds names.
"Stable" if the router is suitable for long-lived circuits.
@@ -1017,6 +1025,10 @@ $Id$
supports the functionality clients need. (Currently, this is
0.2.0.?????-alpha or later.)
+ "HSDir" -- A router is a v2 hidden service directory if it stores and
+ serves v2 hidden service descriptors and the authority managed to connect
+ to it successfully within the last 24 hours.
+
Directory server administrators may label some servers or IPs as
blacklisted, and elect not to include them in their network-status lists.
diff --git a/doc/tor.1.in b/doc/tor.1.in
index bf2832f67..879690b81 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -985,6 +985,11 @@ periodically (every 15 minutes) writes statistics about hidden service
usage to a file \fBhsusage\fP in its data directory. (Default: 0)
.LP
.TP
+\fBHidServDirectoryV2 \fR\fB0\fR|\fB1\fR\fP
+When this option is set, Tor accepts and serves v2 hidden service
+descriptors. (Default: 0)
+.LP
+.TP
\fBDirPort \fR\fIPORT\fP
Advertise the directory service on this port.
.LP