aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2013-07-30 12:05:39 -0400
committerRoger Dingledine <arma@torproject.org>2013-07-30 12:05:39 -0400
commitff6bb13c02b3bb217ac8d48d5a20953f1b188d46 (patch)
tree68e34a3c84b36c68bdaa149b1c3eb47aac6f8f9f /doc
parent8d0fb3a4347aa543d2aa27f177446888fbdae125 (diff)
downloadtor-ff6bb13c02b3bb217ac8d48d5a20953f1b188d46.tar
tor-ff6bb13c02b3bb217ac8d48d5a20953f1b188d46.tar.gz
NumDirectoryGuards now tracks NumEntryGuards by default
Now a user who changes only NumEntryGuards will get the behavior she expects. Fixes bug 9354; bugfix on 0.2.4.8-alpha.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt6
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