Commit efab3484 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

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

parents 35699ef9 8828794d

changes/bug10849_023

0 → 100644
+6 −0
Original line number Diff line number Diff line 
  o Major bugfixes:

    - When running a hidden service, do not allow TunneledDirConns 0;

      this will keep the hidden service from running, and also

      make it publish its descriptors directly over HTTP. Fixes bug 10849;

      bugfix on 0.2.1.1-alpha.

src/or/config.c

+4 −0
Original line number Diff line number Diff line
@@ -3062,6 +3062,10 @@ options_validate(or_options_t *old_options, or_options_t *options, 
    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)