From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 1 May 2014 00:26:55 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.5-alpha~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9511522bd4c072a1d1b03b4d8e866baea3161e35;p=thirdparty%2Ftor.git

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

9511522bd4c072a1d1b03b4d8e866baea3161e35
diff --cc src/or/config.c
index 7850e52270,09fdc0c493..02668e3536
--- 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) {