aboutsummaryrefslogtreecommitdiff
path: root/src/or/dirserv.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-07-31 20:40:23 -0400
committerNick Mathewson <nickm@torproject.org>2017-07-31 20:40:23 -0400
commitec99f038fa6dd5207bc277d9efc815c8d29de52d (patch)
tree77a4c0b91a153e99f293b9abafe9488afa7a3ee1 /src/or/dirserv.c
parent2cb8c8d99f5e5be6a4a2ded9ef73920f72986f45 (diff)
downloadtor-ec99f038fa6dd5207bc277d9efc815c8d29de52d.tar.gz
tor-ec99f038fa6dd5207bc277d9efc815c8d29de52d.zip
Improve the keypin failure message
Closes the human-factors part of ticket 22348.
Diffstat (limited to 'src/or/dirserv.c')
-rw-r--r--src/or/dirserv.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 468fdbd488..4c5309b3ba 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -720,7 +720,10 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source)
log_info(LD_DIRSERV, "Dropping descriptor from %s (source: %s) because "
"its key did not match an older RSA/Ed25519 keypair",
router_describe(ri), source);
- *msg = "Looks like your keypair does not match its older value.";
+ *msg = "Looks like your keypair has changed? This authority previously "
+ "recorded a different RSA identity for this Ed25519 identity (or vice "
+ "versa.) Did you replace or copy some of your key files, but not "
+ "the others?";
r = ROUTER_AUTHDIR_REJECTS;
goto fail;
}