diff options
| author | teor <teor@torproject.org> | 2020-04-05 17:17:47 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-04-05 17:17:47 +1000 |
| commit | e8bbdc69d1cb3260974d0e44aed06e9a6983daa6 (patch) | |
| tree | 85ecbd5058bf1afaa6b06834def868d793e20d3d | |
| parent | 9385020620d9596d4befdc77941280a88f4bac7f (diff) | |
| parent | 80a306c6e7d20efc44f2f93b559c44a52d952c39 (diff) | |
| download | tor-e8bbdc69d1cb3260974d0e44aed06e9a6983daa6.tar.gz tor-e8bbdc69d1cb3260974d0e44aed06e9a6983daa6.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 62d5de4a0c..79809832ca 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -527,7 +527,7 @@ forward slash (/) in the configuration file and on the command line. If this option is set to 1, we always try to include a relay's Ed25519 ID 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 + circuits. If the option is set to "auto", we obey a parameter in the consensus document. (Default: auto) [[ExtORPort]] **ExtORPort** ['address'**:**]{empty}__port__|**auto**:: |