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

diff --cc src/or/config.c
index 15138f9d7b5a6496d76d8d830fb3c693f0867955,aa34f87cef35a69bd36435a5511ac37ed1517e3f..2b94b8316fd9710e01ad1d06d085779f7c12214b
--- 1/src/or/config.c
--- 2/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"))