aboutsummaryrefslogtreecommitdiff
path: root/src/feature/relay
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-10-07 08:26:04 -0400
committerNick Mathewson <nickm@torproject.org>2020-10-07 08:26:04 -0400
commit701a1936fae48c6887cadd90dbe50ae84a00a29f (patch)
treee27f1784f683a1c2969272f452cb095613e032f7 /src/feature/relay
parenta49373844cd3c7047759244a6a5c103304d88a7b (diff)
parentad7ffa5240c4b3a9b675a12f0705d9cbe0bc8beb (diff)
downloadtor-701a1936fae48c6887cadd90dbe50ae84a00a29f.tar.gz
tor-701a1936fae48c6887cadd90dbe50ae84a00a29f.zip
Merge branch 'maint-0.3.5' into maint-0.4.3
Diffstat (limited to 'src/feature/relay')
-rw-r--r--src/feature/relay/ext_orport.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/feature/relay/ext_orport.c b/src/feature/relay/ext_orport.c
index ce4e043dd7..3a9e4abfd0 100644
--- a/src/feature/relay/ext_orport.c
+++ b/src/feature/relay/ext_orport.c
@@ -494,6 +494,10 @@ connection_ext_or_handle_cmd_useraddr(connection_t *conn,
}
conn->address = tor_addr_to_str_dup(&addr);
+ /* Now that we know the address, we don't have to manually override rate
+ * limiting. */
+ conn->always_rate_limit_as_remote = 0;
+
return 0;
}