mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 12:23:32 +01:00
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
This commit is contained in:
commit
efab3484e6
6
changes/bug10849_023
Normal file
6
changes/bug10849_023
Normal 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.
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user