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 | ff02ea65ecb40069ba2023c331c5b60fa5ef2b02 (patch) | |
| tree | a2e7d990ca22c0afb82c7acccaa5d2f68062877f | |
| parent | 4f26c67d45ff5536130da8bbe2b50e3c7158e4a7 (diff) | |
| parent | e658dad625ef15f3a74a76aadf382d43c4ef44d1 (diff) | |
| download | tor-ff02ea65ecb40069ba2023c331c5b60fa5ef2b02.tar.gz tor-ff02ea65ecb40069ba2023c331c5b60fa5ef2b02.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -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 da34c196f4..41c6bf3dc8 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -401,7 +401,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) @@ -419,7 +422,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)) { |