diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-31 21:48:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-31 21:48:48 -0400 |
| commit | 0a0f93d277046a524740ad110060abf8ed137b8f (patch) | |
| tree | 6f34c412941a8fb0fbd7e762114eb870b768317b /doc/tor.1.txt | |
| parent | 5a5147dd2e5450d783de51d369378c59957733e5 (diff) | |
| parent | ff6bb13c02b3bb217ac8d48d5a20953f1b188d46 (diff) | |
| download | tor-0a0f93d277046a524740ad110060abf8ed137b8f.tar tor-0a0f93d277046a524740ad110060abf8ed137b8f.tar.gz | |
Merge remote-tracking branch 'arma/bug9354' into maint-0.2.4
Diffstat (limited to 'doc/tor.1.txt')
| -rw-r--r-- | doc/tor.1.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d5fab04cd..86e9afc18 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1043,7 +1043,8 @@ The following options are useful only for clients (that is, if fraction of your paths. (Default: 1) **UseEntryGuardsAsDirectoryGuards** **0**|**1**:: - If this option is set to 1, we try to use our entry guards as directory + If this option is set to 1, and UseEntryGuards is also set to 1, + we try to use our entry guards as directory guards, and failing that, pick more nodes to act as our directory guards. This helps prevent an adversary from enumerating clients. It's only available for clients (non-relay, non-bridge) that aren't configured to @@ -1056,7 +1057,8 @@ The following options are useful only for clients (that is, if **NumDirectoryGuards** __NUM__:: If UseEntryGuardsAsDirectoryGuards is enabled, we try to make sure we - have at least NUM routers to use as directory guards. (Default: 3) + have at least NUM routers to use as directory guards. If this option + is set to 0, use the value from NumEntryGuards. (Default: 0) **GuardLifetime** __N__ **days**|**weeks**|**months**:: If nonzero, and UseEntryGuards is set, minimum time to keep a guard before |