aboutsummaryrefslogtreecommitdiff
path: root/src/feature/nodelist/networkstatus.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-07-14 10:59:30 -0400
committerNick Mathewson <nickm@torproject.org>2020-07-14 10:59:30 -0400
commit2b33e8037e7ae5e947ce3186a06c90478de6c7e2 (patch)
tree45e365d81b5be942fb4364755ad1b6247a2e9d46 /src/feature/nodelist/networkstatus.c
parent1d554e4bafcff076c0ebba34b8292dea44c6dd06 (diff)
parent268d01ada5f4a11c5d8e63215288eb593dbfb9ed (diff)
downloadtor-2b33e8037e7ae5e947ce3186a06c90478de6c7e2.tar.gz
tor-2b33e8037e7ae5e947ce3186a06c90478de6c7e2.zip
Merge branch 'ticket40033_045_01_squashed'
Diffstat (limited to 'src/feature/nodelist/networkstatus.c')
-rw-r--r--src/feature/nodelist/networkstatus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c
index 2baa405f57..9210518de0 100644
--- a/src/feature/nodelist/networkstatus.c
+++ b/src/feature/nodelist/networkstatus.c
@@ -471,8 +471,8 @@ networkstatus_check_document_signature(const networkstatus_t *consensus,
DIGEST_LEN))
return -1;
- if (authority_cert_is_blacklisted(cert)) {
- /* We implement blacklisting for authority signing keys by treating
+ if (authority_cert_is_denylisted(cert)) {
+ /* We implement denylisting for authority signing keys by treating
* all their signatures as always bad. That way we don't get into
* crazy loops of dropping and re-fetching signatures. */
log_warn(LD_DIR, "Ignoring a consensus signature made with deprecated"