diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-14 07:56:48 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-14 07:56:48 -0500 |
| commit | a58b19465d9ffada3df87ea9be769d1f27c414cc (patch) | |
| tree | dcf5bd9eebac77feeb54003e5a3e5c89705b2963 | |
| parent | eba989bf0e7761713079e4f2af91c9ab9374a300 (diff) | |
| parent | 16ca6fdfdb238046665e749c386c9c28a8245712 (diff) | |
| download | tor-a58b19465d9ffada3df87ea9be769d1f27c414cc.tar.gz tor-a58b19465d9ffada3df87ea9be769d1f27c414cc.zip | |
Merge remote-tracking branch 'teor/bug28441-035' into maint-0.3.5
| -rw-r--r-- | changes/bug28441 | 4 | ||||
| -rw-r--r-- | src/feature/nodelist/nodelist.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/changes/bug28441 b/changes/bug28441 new file mode 100644 index 0000000000..d259b9f742 --- /dev/null +++ b/changes/bug28441 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Stop talking about the Named flag in log messages. Clients have + ignored the Named flag since 0.3.2. Fixes bug 28441; + bugfix on 0.3.2.1-alpha. diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index c77ef443d0..a39eb1d5b8 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) { |