aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-09-15 04:40:08 -0400
committerRoger Dingledine <arma@torproject.org>2009-09-15 04:40:08 -0400
commit40bcab1faf26dd26de48b5ea6c1846c562a11f9d (patch)
treebf9efa03125ade36b479340b7dc4648219838fdf /doc
parent56c6d78520a98fb643e67b80b9192a2875f95e29 (diff)
downloadtor-40bcab1faf26dd26de48b5ea6c1846c562a11f9d.tar
tor-40bcab1faf26dd26de48b5ea6c1846c562a11f9d.tar.gz
ConsensusParams config option lists key=value params
finishes the authority-operator interface side of proposal 167.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index a0f8e8b0f..a5f6fe0f1 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -1,4 +1,4 @@
-.TH TOR 1 "August 2009" "TOR"
+.TH TOR 1 "September 2009" "TOR"
.SH NAME
tor \- The second-generation onion router
.SH SYNOPSIS
@@ -1243,6 +1243,11 @@ When this is set then
\fBVersioningAuthoritativeDirectory\fP should be set too.
.LP
.TP
+\fBConsensusParams \fR\fISTRING\fP
+STRING is a space-separated list of key=value pairs that Tor will
+include in the "params" line of its networkstatus vote.
+.LP
+.TP
\fBDirAllowPrivateAddresses \fR\fB0\fR|\fB1\fR\fP
If set to 1, Tor will accept router descriptors with arbitrary "Address"
elements. Otherwise, if the address is not an IP address or is a private