summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2016-05-03 11:21:17 -0400
committerDavid Goulet <dgoulet@torproject.org>2016-07-01 13:25:03 -0400
commitca6ceec112f05ce68097429089ee428010c8b8d0 (patch)
treea297cc544c7f354a458a1712d7e2d101fcb6aa0b /doc
parent5b183328fdd4bf81a3a38afe88d2766e61773fb9 (diff)
downloadtor-ca6ceec112f05ce68097429089ee428010c8b8d0.tar.gz
tor-ca6ceec112f05ce68097429089ee428010c8b8d0.zip
prop250: Put commits and SRVs in votes/consensus
This commit adds the commit(s) line in the vote as well as the SR values. It also has the mechanism to add the majority SRVs in the consensus. Signed-off-by: George Kadianakis <desnacked@riseup.net> Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 65d3c2d5f5..8508aaaef8 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2225,6 +2225,12 @@ on the public Tor network.
in a journal if it is new, or if it differs from the most recently
accepted pinning for one of the keys it contains. (Default: 0)
+[[AuthDirSharedRandomness]] **AuthDirSharedRandomness** **0**|**1**::
+ Authoritative directories only. Switch for the shared random protocol.
+ If zero, the authority won't participate in the protocol. If non-zero
+ (default), the flag "shared-rand-participate" is added to the authority
+ vote indicating participation in the protocol. (Default: 1)
+
[[BridgePassword]] **BridgePassword** __Password__::
If set, contains an HTTP authenticator that tells a bridge authority to
serve all requested bridge information. Used by the (only partially