sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.8' into release-0.2.8

This commit is contained in:
Nick Mathewson 2016-06-11 10:16:36 -04:00
parent 399eebea54 ada5668c5e
commit 2728a12232
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug19203 Normal file
View File

@ -0,0 +1,4 @@
o Major bugfixes (user interface):
- Correctly give a warning in the cases where a relay is specified by
nickname, and one such relay is found, but it is not officially Named.
Fixes bug 19203; bugfix on 0.2.3.1-alpha.

4
src/or/nodelist.c
View File

@ -594,10 +594,10 @@ node_get_by_nickname,(const char *nickname, int warn_if_unnamed))
"but none is listed as Named in the directory consensus. "
"Choosing one arbitrarily.", nickname);
}
} else if (smartlist_len(matches)>1 && warn_if_unnamed) {
} else if (smartlist_len(matches)==1 && warn_if_unnamed) {
char fp[HEX_DIGEST_LEN+1];
node_t *node = smartlist_get(matches, 0);
if (node->name_lookup_warned) {
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 "