[tor-commits] [tor/release-0.4.5] Merge branch 'tor-gitlab/mr/289' into maint-0.4.5

[dgoulet at torproject.org]

commit ed373eaa8de41f22c28b5c203b85342e0fc48bee
Merge: 387d1d8835 627e7d6625
Author: David Goulet <dgoulet at torproject.org>
Date:   Mon Feb 1 14:09:58 2021 -0500

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

 src/core/or/address_set.c       | 75 -----------------------------------------
 src/core/or/address_set.h       | 15 ---------
 src/core/or/connection_edge.c   |  2 +-
 src/feature/nodelist/nodelist.c | 63 ++++++++++++++++++++++++++--------
 src/feature/nodelist/nodelist.h |  3 +-
 src/test/test_address_set.c     | 12 +++----
 6 files changed, 57 insertions(+), 113 deletions(-)

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;