diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-08 12:35:55 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-16 11:32:51 -0500 |
| commit | 3902a18a6976af2ceb2d6ca43266bf6154881621 (patch) | |
| tree | fdc88e2ac8e0dd776306d581cf22f21b37a95081 /src/or/directory.c | |
| parent | 20292ec4974b777d430e7962cc38349c5f82b220 (diff) | |
| download | tor-3902a18a6976af2ceb2d6ca43266bf6154881621.tar.gz tor-3902a18a6976af2ceb2d6ca43266bf6154881621.zip | |
Remove UseDirectoryGuards
It is obsoleted in an always-on direction by prop271.
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 9c039a006f..acae5de228 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -442,10 +442,9 @@ should_use_directory_guards(const or_options_t *options) /* Public (non-bridge) servers never use directory guards. */ if (public_server_mode(options)) return 0; - /* If guards are disabled, or directory guards are disabled, we can't - * use directory guards. + /* If guards are disabled, we can't use directory guards. */ - if (!options->UseEntryGuards || !options->UseEntryGuardsAsDirGuards) + if (!options->UseEntryGuards) return 0; /* If we're configured to fetch directory info aggressively or of a * nonstandard type, don't use directory guards. */ |