From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 12 Jun 2012 01:50:52 +0000 (-0400)
Subject: fixup! An attempt at bug3940 and making AllowDotExit 0 work with MapAddress
X-Git-Tag: tor-0.2.3.17-beta~21^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba9a12119c88676fa0dd2a282d927840cd5d94fb;p=thirdparty%2Ftor.git

fixup! An attempt at bug3940 and making AllowDotExit 0 work with MapAddress
---

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 12f9d6b4c0..0dd43f2723 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1935,8 +1935,8 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
         (exit_source == ADDRMAPSRC_NONE && !options->AllowDotExit)) {
       /* It shouldn't be possible to get a .exit address from any of these
        * sources. */
-      log_warn(LD_BUG,"Address '%s.exit', with impossible source for the .exit "
-               "part. Refusing.",
+      log_warn(LD_BUG,"Address '%s.exit', with impossible source for the "
+               ".exit part. Refusing.",
                safe_str_client(socks->address));
       control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s",
                                   escaped(socks->address));