tor

commit b062730a11a78f9cb11e4b0af20a66997280c0f9
parent 021c3bd5879f1f3d25823a63c86b159dfb29a434
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 13 Feb 2018 08:50:59 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

Diffstat:
A
changes/ticket25170
 | 
5
+++++
M
src/or/dirserv.c
 | 
10
++++++++--

2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/changes/ticket25170 b/changes/ticket25170
@@ -0,0 +1,5 @@
+  o Minor bugfix (directory authority, documentation):
+    - When a fingerprint or network address is marked as rejected, the
+      returned message by the authority now explicitly mention to set a valid
+      ContactInfo address and contact the bad-relays@ mailing list. Fixes bug
+      25170; bugfix on 0.2.9.1.
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
@@ -417,7 +417,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname,
 
   if (result & FP_REJECT) {
     if (msg)
-      *msg = "Fingerprint is marked rejected -- please contact us?";
+      *msg = "Fingerprint is marked rejected -- if you think this is a "
+             "mistake please set a valid email address in ContactInfo and "
+             "send an email to bad-relays@lists.torproject.org mentioning "
+             "your fingerprint(s)?";
     return FP_REJECT;
   } else if (result & FP_INVALID) {
     if (msg)
@@ -435,7 +438,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname,
     log_fn(severity, LD_DIRSERV, "Rejecting '%s' because of address '%s'",
                nickname, fmt_addr32(addr));
     if (msg)
-      *msg = "Suspicious relay address range -- please contact us?";
+      *msg = "Suspicious relay address range -- if you think this is a "
+             "mistake please set a valid email address in ContactInfo and "
+             "send an email to bad-relays@lists.torproject.org mentioning "
+             "your address(es) and fingerprint(s)?";
     return FP_REJECT;
   }
   if (!authdir_policy_valid_address(addr, or_port)) {