diff options
| author | David Goulet <dgoulet@torproject.org> | 2017-02-01 11:55:26 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-02-02 08:47:59 -0500 |
| commit | 83df35921485ac46e1da0c6789b4b2dbbedf16e6 (patch) | |
| tree | 4bdce67ac8be2c00d9b5a05893c6decb582d1742 | |
| parent | 77788fa5374448fe6e12ab9bf7672d8187f73997 (diff) | |
| download | tor-83df35921485ac46e1da0c6789b4b2dbbedf16e6.tar.gz tor-83df35921485ac46e1da0c6789b4b2dbbedf16e6.zip | |
config: Stop recommending Tor2web if in non anonymous mode
Because we don't allow client functionalities in non anonymous mode,
recommending Tor2web is a bad idea.
If a user wants to use Tor2web as a client (losing all anonymity), it should
run a second tor, not use it with a single onion service tor.
Fixes #21294.
Signed-off-by: David Goulet <dgoulet@torproject.org>
| -rw-r--r-- | changes/bug21294 | 6 | ||||
| -rw-r--r-- | src/or/config.c | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changes/bug21294 b/changes/bug21294 new file mode 100644 index 0000000000..96da1c1438 --- /dev/null +++ b/changes/bug21294 @@ -0,0 +1,6 @@ + o Minor bugfix (logging); + - Don't recommend to use Tor2web in non anonymous mode. In that mode, we + disable client functionalities and recommending Tor2web as a solution is + a bad idea because in that case client loses all anonymity. Tor2web + should really only be used in very specific cases and with users + *knowing* what they do. Fixes #21294; bugfix on tor-0.2.9.3-alpha. diff --git a/src/or/config.c b/src/or/config.c index a07719ecb8..8016282411 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2942,8 +2942,7 @@ options_validate_single_onion(or_options_t *options, char **msg) !options->Tor2webMode) { REJECT("HiddenServiceNonAnonymousMode is incompatible with using Tor as " "an anonymous client. Please set Socks/Trans/NATD/DNSPort to 0, or " - "HiddenServiceNonAnonymousMode to 0, or use the non-anonymous " - "Tor2webMode."); + "revert HiddenServiceNonAnonymousMode to 0."); } /* If you run a hidden service in non-anonymous mode, the hidden service |