summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/ticket204885
-rw-r--r--src/or/nodelist.c8
2 files changed, 8 insertions, 5 deletions
diff --git a/changes/ticket20488 b/changes/ticket20488
new file mode 100644
index 0000000000..ad1b874372
--- /dev/null
+++ 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
index 070e2e9e0d..851a84cbcc 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -602,11 +602,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;
}