Bläddra i källkod

Merge branch 'bug20488_029_squashed'

Nick Mathewson 7 år sedan
förälder
incheckning
139799cdce
2 ändrade filer med 8 tillägg och 5 borttagningar
  1. 5 0
      changes/ticket20488
  2. 3 5
      src/or/nodelist.c

+ 5 - 0
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.
+

+ 3 - 5
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;
       }