diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-02-02 08:48:20 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-02-02 08:48:20 -0500 |
| commit | b11f00c153dc6e107642258e1efe5a6daf641925 (patch) | |
| tree | c852351dbbf569abcada1ada5ae0d45afdff8933 /src | |
| parent | fc3e742b5b804c9ab12c6bd878551b03dfc24ba9 (diff) | |
| parent | 83df35921485ac46e1da0c6789b4b2dbbedf16e6 (diff) | |
| download | tor-b11f00c153dc6e107642258e1efe5a6daf641925.tar.gz tor-b11f00c153dc6e107642258e1efe5a6daf641925.zip | |
Merge branch 'bug21294_030_01_squashed'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 3 |
1 files changed, 1 insertions, 2 deletions
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 |