diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-02-13 08:50:59 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-02-13 08:50:59 -0500 |
| commit | b062730a11a78f9cb11e4b0af20a66997280c0f9 (patch) | |
| tree | 4a61b3c5336f7bf0eb37d413172fa3c78a2fc1be /src/or/dirserv.c | |
| parent | 021c3bd5879f1f3d25823a63c86b159dfb29a434 (diff) | |
| parent | 17a923941a41d9283cad0cb093024c872fafdb0a (diff) | |
| download | tor-b062730a11a78f9cb11e4b0af20a66997280c0f9.tar.gz tor-b062730a11a78f9cb11e4b0af20a66997280c0f9.zip | |
Merge branch 'maint-0.3.1' into maint-0.3.2
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index ddee92da55..ff85dfa2ac 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)) { |