summaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-12-11 13:05:35 -0500
committerNick Mathewson <nickm@torproject.org>2012-12-25 23:14:43 -0500
commit0f9dfef9d636b269acad75f31e4cd278a1f246e9 (patch)
treeff024e698e6b64a7aac14e82f4de470fa5a4cbde /src/or/directory.c
parent0c4210fb65d1fe45cbd39ea078be1b09c0f52fc9 (diff)
downloadtor-0f9dfef9d636b269acad75f31e4cd278a1f246e9.tar.gz
tor-0f9dfef9d636b269acad75f31e4cd278a1f246e9.zip
Add configuration options for directory guards
In addition to all the other ways to make directory gurads not go, you can now set UseEntryGuardsAsDirGuards to 0.
Diffstat (limited to 'src/or/directory.c')
-rw-r--r--src/or/directory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index fc1b76a239..d774dc0138 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -345,7 +345,7 @@ should_use_directory_guards(const or_options_t *options)
/* If guards are disabled, or directory guards are disabled, we can't
* use directory guards.
*/
- if (!options->UseEntryGuards)
+ if (!options->UseEntryGuards || !options->UseEntryGuardsAsDirGuards)
return 0;
/* If we're configured to fetch directory info aggressively or of a
* nonstandard type, don't use directory guards. */