diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-01-21 14:44:00 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-01-21 14:44:00 -0500 |
| commit | e52f49aa800019d3f60b640f5bb82ef7cf5f78e5 (patch) | |
| tree | 70dccb7e70e94e584ebbea38742c0138ff57a812 /doc | |
| parent | 9023d7361d13629e0bc3de081db974a870d306b0 (diff) | |
| parent | 0dd48bfe5aab9ca213dfbacd3b2ee8710a584405 (diff) | |
| download | tor-e52f49aa800019d3f60b640f5bb82ef7cf5f78e5.tar.gz tor-e52f49aa800019d3f60b640f5bb82ef7cf5f78e5.zip | |
Merge remote-tracking branch 'public/ticket18319'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 46b10773bd..8c8922bc29 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2277,7 +2277,7 @@ on the public Tor network. 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) + accepted pinning for one of the keys it contains. (Default: 1) [[AuthDirSharedRandomness]] **AuthDirSharedRandomness** **0**|**1**:: Authoritative directories only. Switch for the shared random protocol. |