summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-02-03 08:54:40 -0500
committerDavid Goulet <dgoulet@torproject.org>2021-02-03 08:54:40 -0500
commit903bfc4eca6a02c56db66c708f3f102129a470df (patch)
treec9e847134e650f2e0cca7a7ac0a72a13d9807039 /src/core
parent36b51a1c716200c65f5bb9f233c461208a8d924c (diff)
parente50648582b6e0bc7bb37edc08e7a4d67b50f2c53 (diff)
downloadtor-903bfc4eca6a02c56db66c708f3f102129a470df.tar.gz
tor-903bfc4eca6a02c56db66c708f3f102129a470df.zip
Merge branch 'maint-0.4.3' into maint-0.4.4
Diffstat (limited to 'src/core')
-rw-r--r--src/core/or/connection_edge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c
index 65e974f496..cd498c2bc0 100644
--- a/src/core/or/connection_edge.c
+++ b/src/core/or/connection_edge.c
@@ -4227,7 +4227,7 @@ connection_exit_connect(edge_connection_t *edge_conn)
* case of an attack so this is a small price to pay. */
if (!connection_edge_is_rendezvous_stream(edge_conn) &&
!network_reentry_is_allowed() &&
- nodelist_reentry_probably_contains(&conn->addr, conn->port)) {
+ nodelist_reentry_contains(&conn->addr, conn->port)) {
log_info(LD_EXIT, "%s:%d tried to connect back to a known relay address. "
"Closing.", escaped_safe_str_client(conn->address),
conn->port);