[tor-commits] [tor/maint-0.3.1] Try to improve the keypinning-failure message even more

[nickm at torproject.org]

commit ab166fe68faa87237c767a38682271b22ce8c029
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 28 11:35:30 2017 -0400

    Try to improve the keypinning-failure message even more
---
 src/or/dirserv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 4c5309b3b..acd00322a 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -723,7 +723,9 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source)
     *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?";
+      "the others? You should either restore the expected keypair, or "
+      "delete your keys and restart Tor to start your relay with a new "
+      "identity.";
     r = ROUTER_AUTHDIR_REJECTS;
     goto fail;
   }