From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 12 Mar 2020 17:42:42 +0000 (-0400)
Subject: Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3
X-Git-Tag: tor-0.4.3.3-alpha~17^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e42004e54054b111068e0a83825b95b7c8ff585;p=thirdparty%2Ftor.git

Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3
---

3e42004e54054b111068e0a83825b95b7c8ff585
diff --cc src/test/test_options.c
index 636d3c0e54,0e52967a23..9cd1d11d29
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@@ -633,24 -631,28 +634,28 @@@ test_options_validate__contactinfo(voi
    setup_capture_of_logs(LOG_DEBUG);
    tdata->opt->ContactInfo = NULL;
  
 -  ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
 -  tt_int_op(ret, OP_EQ, -1);
 +  ret = options_validate(NULL, tdata->opt, &msg);
 +  tt_int_op(ret, OP_EQ, 0);
    expect_log_msg(
-             "Your ContactInfo config option is not"
-             " set. Please consider setting it, so we can contact you if your"
-             " server is misconfigured or something else goes wrong.\n");
+            "Your ContactInfo config option is not set. Please strongly "
+            "consider setting it, so we can contact you if your relay is "
+            "misconfigured, end-of-life, or something else goes wrong. It "
+            "is also possible that your relay might get rejected from the "
+            "network due to a missing valid contact address.\n");
    tor_free(msg);
  
    free_options_test_data(tdata);
    tdata = get_options_test_data("ORPort 127.0.0.1:5555\n"
                                  "ContactInfo hella@example.org");
    mock_clean_saved_logs();
 -  ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
 -  tt_int_op(ret, OP_EQ, -1);
 +  ret = options_validate(NULL, tdata->opt, &msg);
 +  tt_int_op(ret, OP_EQ, 0);
    expect_no_log_msg(
-             "Your ContactInfo config option is not"
-             " set. Please consider setting it, so we can contact you if your"
-             " server is misconfigured or something else goes wrong.\n");
+            "Your ContactInfo config option is not set. Please strongly "
+            "consider setting it, so we can contact you if your relay is "
+            "misconfigured, end-of-life, or something else goes wrong. It "
+            "is also possible that your relay might get rejected from the "
+            "network due to a missing valid contact address.\n");
    tor_free(msg);
  
   done: