aboutsummaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2012-05-10 17:57:31 -0400
committerRoger Dingledine <arma@torproject.org>2012-05-10 17:57:31 -0400
commit648db9a4b7101d54f38aee60f42546e9a172e17e (patch)
tree38a850eb37c2b3806b30b658b4ef7489e707e8bf /src/or/control.c
parent02a650786b21e4f3c255d686a3b5df875b2d66b5 (diff)
parent436654ee9670aed5f21f571f3eae743c109a2eba (diff)
downloadtor-648db9a4b7101d54f38aee60f42546e9a172e17e.tar.gz
tor-648db9a4b7101d54f38aee60f42546e9a172e17e.zip
Merge branch 'maint-0.2.2'
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c
index ec0bb8a7c1..976997dcf0 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -2992,7 +2992,8 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len,
}
if (!authentication_cookie_is_set) {
- connection_write_str_to_buf("515 Cookie authentication is disabled\r\n", conn);
+ connection_write_str_to_buf("515 Cookie authentication is disabled\r\n",
+ conn);
connection_mark_for_close(TO_CONN(conn));
return -1;
}