diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-15 12:38:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-15 12:38:55 -0400 |
| commit | f48daef299c7289ff867e1fc8b56834c8d96ece5 (patch) | |
| tree | 7eb23293c515e3566e90c1ca1c253c5208776a3c /src/or | |
| parent | b163e801bcc96f4720a0ac2bf1ade5eb2701a9c1 (diff) | |
| parent | 8b4728ebd681c395e4a34eabf50035ebd1f05d7d (diff) | |
| download | tor-f48daef299c7289ff867e1fc8b56834c8d96ece5.tar.gz tor-f48daef299c7289ff867e1fc8b56834c8d96ece5.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c index 15138f9d7b..2b94b8316f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2001 Matej Pfajfar. + /* Copyright (c) 2001 Matej Pfajfar. * Copyright (c) 2001-2004, Roger Dingledine. * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. * Copyright (c) 2007-2013, The Tor Project, Inc. */ @@ -2601,9 +2601,9 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->UseBridges && options->EntryNodes) REJECT("You cannot set both UseBridges and EntryNodes."); - if (options->EntryNodes && !options->UseEntryGuards) - log_warn(LD_CONFIG, "EntryNodes is set, but UseEntryGuards is disabled. " - "EntryNodes will be ignored."); + if (options->EntryNodes && !options->UseEntryGuards) { + REJECT("If EntryNodes is set, UseEntryGuards must be enabled."); + } options->AllowInvalid_ = 0; if (options->AllowInvalidNodes) { |