From: David Goulet <dgoulet@torproject.org>
Date: Mon, 1 Feb 2021 19:09:58 +0000 (-0500)
Subject: Merge branch 'tor-gitlab/mr/289' into maint-0.4.5
X-Git-Tag: tor-0.4.5.5-rc^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed373eaa8de41f22c28b5c203b85342e0fc48bee;p=thirdparty%2Ftor.git

Merge branch 'tor-gitlab/mr/289' into maint-0.4.5
---

ed373eaa8de41f22c28b5c203b85342e0fc48bee
diff --cc src/core/or/connection_edge.c
index 04005b29a6,27a616fa24..a33c64fe19
--- a/src/core/or/connection_edge.c
+++ b/src/core/or/connection_edge.c
@@@ -4290,10 -4290,10 +4290,10 @@@ connection_exit_connect(edge_connection
     * 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 tried to connect back to a known relay address. "
                        "Closing.", connection_describe(conn));
 -    connection_edge_end(edge_conn, END_STREAM_REASON_TORPROTOCOL);
 +    connection_edge_end(edge_conn, END_STREAM_REASON_CONNECTREFUSED);
      circuit_detach_stream(circuit_get_by_edge_conn(edge_conn), edge_conn);
      connection_free(conn);
      return;