diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-02-13 08:50:58 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-02-13 08:50:58 -0500 |
| commit | 17a923941a41d9283cad0cb093024c872fafdb0a (patch) | |
| tree | 7e6f712b93ac6180e607c1443dc2eb84f87b18a4 | |
| parent | 91109bc813211516e34f25fc4418211488a8ab57 (diff) | |
| parent | e658dad625ef15f3a74a76aadf382d43c4ef44d1 (diff) | |
| download | tor-17a923941a41d9283cad0cb093024c872fafdb0a.tar.gz tor-17a923941a41d9283cad0cb093024c872fafdb0a.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.1
| -rw-r--r-- | changes/ticket25170 | 5 | ||||
| -rw-r--r-- | src/or/dirserv.c | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/changes/ticket25170 b/changes/ticket25170 new file mode 100644 index 0000000000..0652139400 --- /dev/null +++ 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 index acd00322a1..8aa81c3339 100644 --- 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)) { |