diff options
| author | teor <teor2345@gmail.com> | 2016-09-06 16:22:07 +1000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-13 10:13:56 -0400 |
| commit | 41f96078c23e3ef1c39a853841332cac3e133a94 (patch) | |
| tree | 199e75ee2649d7421ee855e31ef2252c74ee57f1 /doc | |
| parent | 0285f4f34d72b2b77f36fd55fa46216f6b54efc4 (diff) | |
| download | tor-41f96078c23e3ef1c39a853841332cac3e133a94.tar.gz tor-41f96078c23e3ef1c39a853841332cac3e133a94.zip | |
Refactor UseEntryNodes so the original configured value is preserved
Parse the value to UseEntryNodes_option, then set UseEntryNodes before
validating options.
This way, Authorities, Tor2web, and Single Onion Services don't write
spurious "UseEntryNodes 0" lines to their configs. Document the fact that
these tor configurations ignore UseEntryNodes in the manual page.
Also reorder options validation so we modify UseEntryNodes first, then
check its value against EntryNodes.
And silence a warning about disabled UseEntryNodes for hidden services
when we're actually in non-anonymous single onion service mode.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index bd25a614a8..f353637d67 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1184,7 +1184,9 @@ The following options are useful only for clients (that is, if If this option is set to 1, we pick a few long-term entry servers, and try to stick with them. This is desirable because constantly changing servers increases the odds that an adversary who owns some servers will observe a - fraction of your paths. (Default: 1) + fraction of your paths. Entry Guards can not be used by Directory + Authorities, Single Onion Services, and Tor2web clients. In these cases, + the this option is ignored. (Default: 1) [[UseEntryGuardsAsDirGuards]] **UseEntryGuardsAsDirGuards** **0**|**1**:: If this option is set to 1, and UseEntryGuards is also set to 1, |