nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug20488_029_squashed'

Browse Source
This commit is contained in:
Nick Mathewson 2017-07-06 09:29:03 -04:00
commit 139799cdce
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket20488 Normal file
View File

@ -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.

8
src/or/nodelist.c
View File

@ -630,11 +630,9 @@ node_get_by_nickname,(const char *nickname, int warn_if_unnamed))
if (! node->name_lookup_warned) { if (! node->name_lookup_warned) {
base16_encode(fp, sizeof(fp), node->identity, DIGEST_LEN); base16_encode(fp, sizeof(fp), node->identity, DIGEST_LEN);
log_warn(LD_CONFIG, log_warn(LD_CONFIG,
"You specified a server \"%s\" by name, but the directory " "You specified a relay \"%s\" by name, but nicknames can be "
"authorities do not have any key registered for this " "used by any relay, not just the one you meant. "
"nickname -- so it could be used by any server, not just " "To make sure you get the same relay in the future, refer "
"the one you meant. "
"To make sure you get the same server in the future, refer "
"to it by key, as \"$%s\".", nickname, fp); "to it by key, as \"$%s\".", nickname, fp);
node->name_lookup_warned = 1; node->name_lookup_warned = 1;
} }