diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-09-23 11:30:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-09-24 11:29:05 -0400 |
| commit | 51d18aeb425ba5127d8c68f386f3c58b5bbc38e1 (patch) | |
| tree | 798552a01e694088ad4155a91fc094d18c1a0bf5 /doc/tor.1.txt | |
| parent | 01733e2b1568dacea26765800fab2c66f0b16bd1 (diff) | |
| download | tor-51d18aeb425ba5127d8c68f386f3c58b5bbc38e1.tar.gz tor-51d18aeb425ba5127d8c68f386f3c58b5bbc38e1.zip | |
changes file and manpage entry for AuthDirPinKeys
Diffstat (limited to 'doc/tor.1.txt')
| -rw-r--r-- | doc/tor.1.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 14b13bc09e..954c8fa243 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2081,6 +2081,13 @@ on the public Tor network. or more is always sufficient to satisfy the bandwidth requirement for the Guard flag. (Default: 250 KBytes) +[[AuthDirPinKeys]] **AuthDirPinKeys** **0**|**1**:: + Authoritative directories only. If non-zero, do not allow any relay to + publish a descriptor if any other relay has reserved its <Ed25519,RSA> + identity keypair. In all cases, Tor records every keypair it accepts + 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) + [[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 |