diff options
| author | teor <teor@torproject.org> | 2020-04-05 17:12:07 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-04-05 17:12:07 +1000 |
| commit | 9385020620d9596d4befdc77941280a88f4bac7f (patch) | |
| tree | 57d4b951099086c3c6bbf925fe679c26eb044660 | |
| parent | 2b2e53b7fb5dc68ba4fa5d3b14fc5ca0a78648a2 (diff) | |
| parent | 613077229f7a3595e8c1ddd180175c513390da3e (diff) | |
| download | tor-9385020620d9596d4befdc77941280a88f4bac7f.tar.gz tor-9385020620d9596d4befdc77941280a88f4bac7f.zip | |
Merge branch 'maint-0.4.3' into release-0.4.3
| -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 41b8585cc0..62d5de4a0c 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -525,7 +525,7 @@ forward slash (/) in the configuration file and on the command line. [[ExtendByEd25519ID]] **ExtendByEd25519ID** **0**|**1**|**auto**:: If this option is set to 1, we always try to include a relay's Ed25519 ID - when telling the proceeding relay in a circuit to extend to it. + when telling the preceding relay in a circuit to extend to it. If this option is set to 0, we never include Ed25519 IDs when extending circuits. If the option is set to "default", we obey a parameter in the consensus document. (Default: auto) |