diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-11-14 07:56:52 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-11-14 07:56:52 -0500 |
commit | cec58ae55c4625878213e8794e3784cd16e2af67 (patch) | |
tree | 74cbc6d3b86d17519f4c6aa2926e1b8332e5b71e /src | |
parent | 3deb01e1a4209fabd6313acc273765ab02f481cf (diff) | |
parent | a58b19465d9ffada3df87ea9be769d1f27c414cc (diff) | |
download | tor-cec58ae55c4625878213e8794e3784cd16e2af67.tar.gz tor-cec58ae55c4625878213e8794e3784cd16e2af67.zip |
Merge branch 'maint-0.3.5'
Diffstat (limited to 'src')
-rw-r--r-- | src/feature/nodelist/nodelist.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index 2a369e0da7..9ddb71e8a6 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -1019,8 +1019,7 @@ node_get_by_nickname,(const char *nickname, unsigned flags)) } SMARTLIST_FOREACH_END(node); if (any_unwarned) { - log_warn(LD_CONFIG, "There are multiple matches for the name %s, " - "but none is listed as Named in the directory consensus. " + log_warn(LD_CONFIG, "There are multiple matches for the name %s. " "Choosing one arbitrarily.", nickname); } } else if (smartlist_len(matches)==1 && warn_if_unnamed) { |