diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-30 20:25:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-30 20:25:15 -0400 |
| commit | efab3484e6ea3a799ccf61061450cfc35791ad41 (patch) | |
| tree | ca844958b9b86612ede4fa9f50f739b9db3b27b3 | |
| parent | 35699ef9f5d2814203653e16cb0cd176a0190ae0 (diff) | |
| parent | 8828794dc295e3d40dbc35cd58f4c449c632085b (diff) | |
| download | tor-efab3484e6ea3a799ccf61061450cfc35791ad41.tar.gz tor-efab3484e6ea3a799ccf61061450cfc35791ad41.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
| -rw-r--r-- | changes/bug10849_023 | 6 | ||||
| -rw-r--r-- | src/or/config.c | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changes/bug10849_023 b/changes/bug10849_023 new file mode 100644 index 0000000000..480dea3de0 --- /dev/null +++ b/changes/bug10849_023 @@ -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. + diff --git a/src/or/config.c b/src/or/config.c index 85a5e83d5d..09fdc0c493 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -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) |