Refactor Single Onion code to improve consistency

* Check consistency between the two single onion torrc options
* Use the more relevant option each time we check for single onion mode
* Clarify log messages
* Clarify comments
* Otherwise, no behaviour change

1 files changed, 4 insertions, 4 deletions

diff --git a/src/test/test_options.c b/src/test/test_options.c
index cd1821a77e..f01e137f8f 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -2813,10 +2813,10 @@ test_options_validate__single_onion(void *ignored)
                                 );
   ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
   tt_int_op(ret, OP_EQ, -1);
-  tt_str_op(msg, OP_EQ, "OnionServiceSingleHopMode is incompatible with using "
-            "Tor as an anonymous client. Please set Socks/Trans/NATD/DNSPort "
-            "to 0, or OnionServiceSingleHopMode to 0, or use the "
-            "non-anonymous Tor2webMode.");
+  tt_str_op(msg, OP_EQ, "OnionServiceNonAnonymousMode is incompatible with "
+            "using Tor as an anonymous client. Please set "
+            "Socks/Trans/NATD/DNSPort to 0, or OnionServiceNonAnonymousMode "
+            "to 0, or use the non-anonymous Tor2webMode.");
   tor_free(msg);
   free_options_test_data(tdata);