[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit 9511522bd4c072a1d1b03b4d8e866baea3161e35
Merge: f43fee8 efab348
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 30 20:26:55 2014 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4'

 changes/bug10849_023 |    6 ++++++
 src/or/config.c      |    4 ++++
 2 files changed, 10 insertions(+)

diff --cc src/or/config.c
index 7850e52,09fdc0c..02668e3
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -3277,12 -3062,14 +3277,16 @@@ options_validate(or_options_t *old_opti
      REJECT("If you set UseBridges, you must specify at least one bridge.");
    if (options->UseBridges && !options->TunnelDirConns)
      REJECT("If you set UseBridges, you must set TunnelDirConns.");
+   if (options->RendConfigLines &&
+       (!options->TunnelDirConns || !options->PreferTunneledDirConns))
+     REJECT("If you are running a hidden service, you must set TunnelDirConns "
+            "and PreferTunneledDirConns");
  
    for (cl = options->Bridges; cl; cl = cl->next) {
 -    if (parse_bridge_line(cl->value, 1)<0)
 -      REJECT("Bridge line did not parse. See logs for details.");
 +      bridge_line_t *bridge_line = parse_bridge_line(cl->value);
 +      if (!bridge_line)
 +        REJECT("Bridge line did not parse. See logs for details.");
 +      bridge_line_free(bridge_line);
    }
  
    for (cl = options->ClientTransportPlugin; cl; cl = cl->next) {