mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'arma/feature18760'

Browse source
This commit is contained in:
Nick Mathewson 2016-05-11 13:22:31 -04:00
commit 3c6f059e6a
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
changes/feature18760 Normal file
View file

@ -0,0 +1,6 @@
o Minor features:
- When the directory authorities refuse a bad relay's descriptor,
encourage the relay operator to contact us. Many relay operators
won't notice this line in their logs, but it's a win if even a
few learn why we don't like what their relay was doing. Resolves
ticket 18760.

4
src/or/dirserv.c
View file

@ -349,7 +349,7 @@ 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"; *msg = "Fingerprint is marked rejected -- please contact us?";
return FP_REJECT; return FP_REJECT;
} else if (result & FP_INVALID) { } else if (result & FP_INVALID) {
if (msg) if (msg)
@ -367,7 +367,7 @@ 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 = "Authdir is rejecting routers in this range."; *msg = "Suspicious relay address range -- please contact us?";
return FP_REJECT; return FP_REJECT;
} }
if (!authdir_policy_valid_address(addr, or_port)) { if (!authdir_policy_valid_address(addr, or_port)) {