Merge remote-tracking branch 'dgoulet/bug21294_030_02'

This commit is contained in:
Nick Mathewson
2017-02-02 09:07:20 -05:00
+2 -2
View File
@@ -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);