aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-11-06 11:15:45 +1000
committerteor <teor@torproject.org>2019-11-06 11:15:45 +1000
commit0650bf3695ae2e118426f3f6ecf1f8a344562119 (patch)
tree313f23180f91682ae0e3f639e325cc3f7d53277f /src
parentc06d540ff9b507e0fa9749948fe406fb17dbee73 (diff)
parentf0e4120996d3a96252200ea5302dcde3af6e0bc0 (diff)
downloadtor-0650bf3695ae2e118426f3f6ecf1f8a344562119.tar.gz
tor-0650bf3695ae2e118426f3f6ecf1f8a344562119.zip
Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9
Diffstat (limited to 'src')
-rw-r--r--src/or/connection_edge.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 7a97c632d1..5638d9a1be 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1186,9 +1186,11 @@ connection_ap_handshake_rewrite(entry_connection_t *conn,
* disallowed when they're coming straight from the client, but you're
* allowed to have them in MapAddress commands and so forth. */
if (!strcmpend(socks->address, ".exit") && !options->AllowDotExit) {
- log_warn(LD_APP, "The \".exit\" notation is disabled in Tor due to "
- "security risks. Set AllowDotExit in your torrc to enable "
- "it (at your own risk).");
+ static ratelim_t exit_warning_limit = RATELIM_INIT(60*15);
+ log_fn_ratelim(&exit_warning_limit, LOG_WARN, LD_APP,
+ "The \".exit\" notation is disabled in Tor due to "
+ "security risks. Set AllowDotExit in your torrc to enable "
+ "it (at your own risk).");
control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s",
escaped(socks->address));
out->end_reason = END_STREAM_REASON_TORPROTOCOL;