summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2018-11-07 18:48:21 +1000
committerteor <teor@torproject.org>2018-11-14 18:16:34 +1000
commit16ca6fdfdb238046665e749c386c9c28a8245712 (patch)
treeff7971d28ce5faecacc3126ec3a399294db472b0
parent021187f91503814f13dd73b9ed835c20c57f945d (diff)
downloadtor-16ca6fdfdb238046665e749c386c9c28a8245712.tar.gz
tor-16ca6fdfdb238046665e749c386c9c28a8245712.zip
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.
-rw-r--r--changes/bug284414
-rw-r--r--src/feature/nodelist/nodelist.c3
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 a98a5c8655..89c6738673 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) {