commit e069b0af4b5d5825a23f3bf6a601cc4738599be6 Merge: ce57404a42 18d2c7c5d7 Author: George Kadianakis desnacked@riseup.net Date: Mon Aug 3 16:49:05 2020 +0300

Merge branch 'maint-0.4.4'

changes/ticket33747 | 7 +++++++ src/core/mainloop/connection.c | 7 ++++++- src/core/or/connection_st.h | 3 +++ src/feature/relay/ext_orport.c | 4 ++++ 4 files changed, 20 insertions(+), 1 deletion(-)

diff --cc src/core/mainloop/connection.c index d5a46143e9,36adc43d1e..b89a4ae796 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@@ -566,11 -382,14 +566,15 @@@ or_connection_new(int type, int socket_ tor_assert(type == CONN_TYPE_OR || type == CONN_TYPE_EXT_OR); connection_init(now, TO_CONN(or_conn), type, socket_family);

+ tor_addr_make_unspec(&or_conn->canonical_orport.addr); connection_or_set_canonical(or_conn, 0);

- if (type == CONN_TYPE_EXT_OR) + if (type == CONN_TYPE_EXT_OR) { + /* If we aren't told an address for this connection, we should + * presume it isn't local, and should be rate-limited. */ + TO_CONN(or_conn)->always_rate_limit_as_remote = 1; connection_or_set_ext_or_identifier(or_conn); + }

return or_conn; }