mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Nick Mathewson 2014-04-30 20:25:15 -04:00
commit efab3484e6
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
changes/bug10849_023 Normal file
View file

@ -0,0 +1,6 @@
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.

4
src/or/config.c
View file

@ -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."); REJECT("If you set UseBridges, you must specify at least one bridge.");
if (options->UseBridges && !options->TunnelDirConns) if (options->UseBridges && !options->TunnelDirConns)
REJECT("If you set UseBridges, you must set 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) { for (cl = options->Bridges; cl; cl = cl->next) {
if (parse_bridge_line(cl->value, 1)<0) if (parse_bridge_line(cl->value, 1)<0)