aboutsummaryrefslogtreecommitdiff
path: root/src/core/or/connection_or.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/core/or/connection_or.c
parent1d554e4bafcff076c0ebba34b8292dea44c6dd06 (diff)
parent268d01ada5f4a11c5d8e63215288eb593dbfb9ed (diff)
downloadtor-2b33e8037e7ae5e947ce3186a06c90478de6c7e2.tar.gz
tor-2b33e8037e7ae5e947ce3186a06c90478de6c7e2.zip
Merge branch 'ticket40033_045_01_squashed'
Diffstat (limited to 'src/core/or/connection_or.c')
-rw-r--r--src/core/or/connection_or.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c
index 1e49155fa5..079fa3dfcb 100644
--- a/src/core/or/connection_or.c
+++ b/src/core/or/connection_or.c
@@ -1160,7 +1160,7 @@ static time_t or_connect_failure_map_next_cleanup_ts = 0;
* port.
*
* We need to identify a connection failure with these three values because we
- * want to avoid to wrongfully blacklist a relay if someone is trying to
+ * want to avoid to wrongfully block a relay if someone is trying to
* extend to a known identity digest but with the wrong IP/port. For instance,
* it can happen if a relay changed its port but the client still has an old
* descriptor with the old port. We want to stop connecting to that