tor

commit 139799cdceadafd8dbbc54fb73bfa91179489b58
parent 68a2c75ab7ff74df2cf770d7f10427b71d942301
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu,  6 Jul 2017 09:29:03 -0400

Merge branch 'bug20488_029_squashed'

Diffstat:
A
changes/ticket20488
 | 
5
+++++
M
src/or/nodelist.c
 | 
8
+++-----

2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/changes/ticket20488 b/changes/ticket20488
@@ -0,0 +1,5 @@
+  o Minor features (logging, UI):
+    - Improve the warning message for specifying a relay by nickname.
+      The previous message implied that nickname registration was still
+      part of the Tor network design, which it isn't. Closes ticket 20488.
+
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
@@ -630,11 +630,9 @@ node_get_by_nickname,(const char *nickname, int warn_if_unnamed))
       if (! node->name_lookup_warned) {
         base16_encode(fp, sizeof(fp), node->identity, DIGEST_LEN);
         log_warn(LD_CONFIG,
-                 "You specified a server \"%s\" by name, but the directory "
-                 "authorities do not have any key registered for this "
-                 "nickname -- so it could be used by any server, not just "
-                 "the one you meant. "
-                 "To make sure you get the same server in the future, refer "
+                 "You specified a relay \"%s\" by name, but nicknames can be "
+                 "used by any relay, not just the one you meant. "
+                 "To make sure you get the same relay in the future, refer "
                  "to it by key, as \"$%s\".", nickname, fp);
         node->name_lookup_warned = 1;
       }