summaryrefslogtreecommitdiff
path: root/src/feature
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-10-07 08:25:55 -0400
committerNick Mathewson <nickm@torproject.org>2020-10-07 08:25:55 -0400
commitad7ffa5240c4b3a9b675a12f0705d9cbe0bc8beb (patch)
treeb3ca342876222d4a8238d5c8bb645af1b305e958 /src/feature
parent98e14720b5bc30a7cf9af15a1f618ddce0922ef9 (diff)
parentceb6585a4bc2beadde2fb194395711e72ee8559d (diff)
downloadtor-ad7ffa5240c4b3a9b675a12f0705d9cbe0bc8beb.tar.gz
tor-ad7ffa5240c4b3a9b675a12f0705d9cbe0bc8beb.zip
Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.3.5
Diffstat (limited to 'src/feature')
-rw-r--r--src/feature/relay/ext_orport.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/feature/relay/ext_orport.c b/src/feature/relay/ext_orport.c
index 56c5bb96f5..136aee3084 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;
}
@@ -659,4 +663,3 @@ ext_orport_free_all(void)
if (ext_or_auth_cookie) /* Free the auth cookie */
tor_free(ext_or_auth_cookie);
}
-