Commit 17a92394 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.2.9' into maint-0.3.1

parents 91109bc8 e658dad6

changes/ticket25170

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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.

src/or/dirserv.c

+8 −2
Original line number Diff line number Diff line
@@ -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)) {