nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.9' into maint-0.3.1

Browse Source
This commit is contained in:
Nick Mathewson 2018-02-13 08:50:58 -05:00
commit 17a923941a
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket25170 Normal file
View File

@ -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.

10
src/or/dirserv.c
View File

@ -417,7 +417,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname,
if (result & FP_REJECT) { if (result & FP_REJECT) {
if (msg) 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; return FP_REJECT;
} else if (result & FP_INVALID) { } else if (result & FP_INVALID) {
if (msg) 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'", log_fn(severity, LD_DIRSERV, "Rejecting '%s' because of address '%s'",
nickname, fmt_addr32(addr)); nickname, fmt_addr32(addr));
if (msg) 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; return FP_REJECT;
} }
if (!authdir_policy_valid_address(addr, or_port)) { if (!authdir_policy_valid_address(addr, or_port)) {