commit 8b4728ebd681c395e4a34eabf50035ebd1f05d7d Merge: 0cf327d 686aaa5 Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 15 12:38:11 2013 -0400

Merge remote-tracking branch 'public/bug8180_023_v2' into maint-0.2.4

changes/bug8180 | 7 +++++++ src/or/config.c | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-)

diff --cc src/or/config.c index 15138f9,aa34f87..2b94b83 --- a/src/or/config.c +++ b/src/or/config.c @@@ -1,7 -1,7 +1,7 @@@ - /* 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-2012, The Tor Project, Inc. */ + * Copyright (c) 2007-2013, The Tor Project, Inc. */ /* See LICENSE for licensing information */

/** @@@ -2601,11 -3664,11 +2601,11 @@@ options_validate(or_options_t *old_opti 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; + options->AllowInvalid_ = 0; if (options->AllowInvalidNodes) { SMARTLIST_FOREACH_BEGIN(options->AllowInvalidNodes, const char *, cp) { if (!strcasecmp(cp, "entry"))