diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-07-06 09:29:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-07-06 09:29:03 -0400 |
| commit | 139799cdceadafd8dbbc54fb73bfa91179489b58 (patch) | |
| tree | d5afecfa5fc2a7b3f4da2f6b4d352b071bfb76df /src/or/nodelist.c | |
| parent | 68a2c75ab7ff74df2cf770d7f10427b71d942301 (diff) | |
| parent | 41fe94ef15838d809552b239b04c2aa442e1c775 (diff) | |
| download | tor-139799cdceadafd8dbbc54fb73bfa91179489b58.tar.gz tor-139799cdceadafd8dbbc54fb73bfa91179489b58.zip | |
Merge branch 'bug20488_029_squashed'
Diffstat (limited to 'src/or/nodelist.c')
| -rw-r--r-- | src/or/nodelist.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 6ec7da798f..dafeb9f12d 100644 --- 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; } |