summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-02-02 09:07:20 -0500
committerNick Mathewson <nickm@torproject.org>2017-02-02 09:07:20 -0500
commit96dce88d80f422914eb93a7236e5dc1eaed4cfb6 (patch)
treebd33b374b01317224a8966ea12cbd8e898f26e6e
parent6777cd0a8486a4930ec3020fdf31dc2be1c34f9b (diff)
parent5f6d53cefada83296414908d441b925b1e007c94 (diff)
downloadtor-96dce88d80f422914eb93a7236e5dc1eaed4cfb6.tar.gz
tor-96dce88d80f422914eb93a7236e5dc1eaed4cfb6.zip
Merge remote-tracking branch 'dgoulet/bug21294_030_02'
-rw-r--r--src/test/test_options.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/test_options.c b/src/test/test_options.c
index 41c015bdd4..e822404d18 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -2826,8 +2826,8 @@ test_options_validate__single_onion(void *ignored)
tt_int_op(ret, OP_EQ, -1);
tt_str_op(msg, OP_EQ, "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.");
+ "Socks/Trans/NATD/DNSPort to 0, or revert "
+ "HiddenServiceNonAnonymousMode to 0.");
tor_free(msg);
free_options_test_data(tdata);