[tor-commits] [tor/maint-0.3.5] log: stop talking about the Named flag in log messages

[nickm at torproject.org]

commit 16ca6fdfdb238046665e749c386c9c28a8245712
Author: teor <teor at torproject.org>
Date:   Wed Nov 7 18:48:21 2018 +1000

    log: 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.
---
 changes/bug28441                | 4 ++++
 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 000000000..d259b9f74
--- /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 a98a5c865..89c673867 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) {