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

diff --cc src/or/config.c
index 7850e52270bc30c1da8622b95dc4403fd0044fff,09fdc0c4934f40caf4aa6efb49302a31da63f1e9..02668e35367bdcbd99e658618e89aaf2834fa32b
--- 1/src/or/config.c
--- 2/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) {