diff options
| author | teor <teor@torproject.org> | 2020-04-05 17:12:11 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-04-05 17:12:11 +1000 |
| commit | 5c35bb38dfb07e58332a63d2705ea68d4392df2d (patch) | |
| tree | 394b2b27ba01f2b7ee93e7e6302aba620a37ae77 /doc | |
| parent | 1e75974362e2bdbbd2402f5fd6a9aeda4b2a8a38 (diff) | |
| parent | 613077229f7a3595e8c1ddd180175c513390da3e (diff) | |
| download | tor-5c35bb38dfb07e58332a63d2705ea68d4392df2d.tar.gz tor-5c35bb38dfb07e58332a63d2705ea68d4392df2d.zip | |
Merge branch 'maint-0.4.3'
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 5b55b39d47..53be76f965 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) |