diff options
| author | teor <teor@torproject.org> | 2020-04-05 17:17:51 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-04-05 17:17:51 +1000 |
| commit | 7adf72f1b426d8fa6e9f7439e735ce1d38ae57fa (patch) | |
| tree | 02a592b5666d707e5d71bea8d3a6a721351948a7 /doc | |
| parent | 5c35bb38dfb07e58332a63d2705ea68d4392df2d (diff) | |
| parent | 80a306c6e7d20efc44f2f93b559c44a52d952c39 (diff) | |
| download | tor-7adf72f1b426d8fa6e9f7439e735ce1d38ae57fa.tar.gz tor-7adf72f1b426d8fa6e9f7439e735ce1d38ae57fa.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 53be76f965..7126cb8a58 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**:: |