Merge branch 'bug21294_030_01_squashed'

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.

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