diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-07-01 15:29:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-07-01 15:29:05 -0400 |
| commit | aaa31290431ea2cd1d1e8498dbe271eb53d2389d (patch) | |
| tree | d7ff38ffee26c5ab4571f089e8cf06d9e687a14c /doc | |
| parent | 738a8c655a1f8067b330b132164fa8879ef102c3 (diff) | |
| parent | 36e201dffc5d57d92113e1e68ad4b6a0a7b3471e (diff) | |
| download | tor-aaa31290431ea2cd1d1e8498dbe271eb53d2389d.tar.gz tor-aaa31290431ea2cd1d1e8498dbe271eb53d2389d.zip | |
Merge remote-tracking branch 'dgoulet/ticket16943_029_05-squashed'
Trivial Conflicts:
src/or/or.h
src/or/routerparse.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 64f0da0eeb..f42ac8cd03 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2239,6 +2239,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 |