summaryrefslogtreecommitdiff
path: root/src/or/connection_edge.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-02-09 12:50:45 -0500
committerNick Mathewson <nickm@torproject.org>2010-02-09 12:50:45 -0500
commit6dd71d314dfe361aab52628e54f3aa9666c115e4 (patch)
tree46c87a574bfb25c40765594eaf99be57dddf17cc /src/or/connection_edge.c
parentd784eecad9c2d25ff45b86e43a623b73c259b86f (diff)
parent253fd21ae1cbf66efe0eedc4eee26f8c712d2804 (diff)
downloadtor-6dd71d314dfe361aab52628e54f3aa9666c115e4.tar.gz
tor-6dd71d314dfe361aab52628e54f3aa9666c115e4.zip
Merge remote branch 'sebastian/bug1238'
Diffstat (limited to 'src/or/connection_edge.c')
-rw-r--r--src/or/connection_edge.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 8bb6742dca..8e2fcf977e 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2937,7 +2937,8 @@ parse_extended_hostname(char *address, int allowdotexit)
return EXIT_HOSTNAME; /* .exit */
} else {
log_warn(LD_APP, "The \".exit\" notation is disabled in Tor due to "
- "security risks. Set AllowDotExit in your torrc to enable it.");
+ "security risks. Set AllowDotExit in your torrc to enable "
+ "it.");
/* FFFF send a controller event too to notify Vidalia users */
return BAD_HOSTNAME;
}