diff options
| author | Roger Dingledine <arma@torproject.org> | 2014-07-24 16:23:08 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2014-07-24 16:23:08 -0400 |
| commit | a4c641cce91acb673f81db2b6093fde425039eaf (patch) | |
| tree | 80ab630220e7565788719f359b495f5f70246713 /src/or/config.c | |
| parent | 5c200d9be28ac9e53caac333ddd334539524d9e1 (diff) | |
| parent | 71c62b15ca809105cbba0bf2fa86484793701b64 (diff) | |
| download | tor-a4c641cce91acb673f81db2b6093fde425039eaf.tar.gz tor-a4c641cce91acb673f81db2b6093fde425039eaf.zip | |
Merge branch 'maint-0.2.4' into maint-0.2.5
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 10df83975f..4182411354 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -325,7 +325,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), @@ -3251,9 +3251,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. " |