diff options
| author | Roger Dingledine <arma@torproject.org> | 2014-07-23 12:23:49 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2014-07-24 16:19:47 -0400 |
| commit | 56ee61b8aed058c20edc9c7e10dc48f1ab798bbc (patch) | |
| tree | 5cac3437531179784b199c834df442c95b7a6bfb /src/or/config.c | |
| parent | 303d7f55d9ec8c7dbd9784171cf4df97cc5d7eef (diff) | |
| download | tor-56ee61b8aed058c20edc9c7e10dc48f1ab798bbc.tar.gz tor-56ee61b8aed058c20edc9c7e10dc48f1ab798bbc.zip | |
Add and use a new NumEntryGuards consensus parameter.
When specified, it overrides our default of 3 entry guards.
(By default, it overrides the number of directory guards too.)
Implements ticket 12688.
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c index 09fdc0c493..a2811ebc21 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -315,7 +315,7 @@ static config_var_t option_vars_[] = { VAR("NodeFamily", LINELIST, NodeFamilies, NULL), V(NumCPUs, UINT, "0"), V(NumDirectoryGuards, UINT, "0"), - V(NumEntryGuards, UINT, "3"), + V(NumEntryGuards, UINT, "0"), V(ORListenAddress, LINELIST, NULL), VPORT(ORPort, LINELIST, NULL), V(OutboundBindAddress, LINELIST, NULL), @@ -3031,9 +3031,6 @@ options_validate(or_options_t *old_options, or_options_t *options, "have it group-readable."); } - if (options->UseEntryGuards && ! options->NumEntryGuards) - REJECT("Cannot enable UseEntryGuards with NumEntryGuards set to 0"); - if (options->MyFamily && options->BridgeRelay) { log_warn(LD_CONFIG, "Listing a family for a bridge relay is not " "supported: it can reveal bridge fingerprints to censors. " |