Merge branch 'bug31466_029' into bug31466_035_tmp

diff --cc src/core/or/connection_edge.c
index 7cc67d7f5ec7393175cf62f9025940f47e17327d,5638d9a1be1582569dd5ffe159fed0af5a8a42d2..90991107dc5b1ddab5596132ace82d520308c91b
--- 1/src/core/or/connection_edge.c
--- 2/src/or/connection_edge.c
+++ b/src/core/or/connection_edge.c
@@@ -1597,9 -1185,12 +1597,11 @@@ connection_ap_handshake_rewrite(entry_c
    /* Check for whether this is a .exit address.  By default, those are
     * 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) {
 +  if (!strcmpend(socks->address, ".exit")) {
-     log_warn(LD_APP, "The  \".exit\" notation is disabled in Tor due to "
-              "security risks.");
+     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).");
++                   "security risks.");
      control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s",
                                  escaped(socks->address));
      out->end_reason = END_STREAM_REASON_TORPROTOCOL;