[tor-commits] [tor/master] config: Stop recommending Tor2web if in non anonymous mode

[nickm at torproject.org]

commit 83df35921485ac46e1da0c6789b4b2dbbedf16e6
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Feb 1 11:55:26 2017 -0500

    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 at torproject.org>
---
 changes/bug21294 | 6 ++++++
 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 0000000..96da1c1
--- /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 a07719e..8016282 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