tor

commit a58b19465d9ffada3df87ea9be769d1f27c414cc
parent eba989bf0e7761713079e4f2af91c9ab9374a300
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 14 Nov 2018 07:56:48 -0500

Merge remote-tracking branch 'teor/bug28441-035' into maint-0.3.5

Diffstat:
A
changes/bug28441
 | 
4
++++
M
src/feature/nodelist/nodelist.c
 | 
3
+--

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/changes/bug28441 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
@@ -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) {