diff options
author | Roger Dingledine <arma@torproject.org> | 2012-05-10 17:57:16 -0400 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2012-05-10 17:57:16 -0400 |
commit | 0daad3e44d609b451173d1fdbbb39f28f2d1d461 (patch) | |
tree | 4a5d6e972ade3ea200fca5eba07fbc7d13d7e3fb | |
parent | d06ea86850704084670ec864a685a5e857c3a6a6 (diff) | |
parent | 436654ee9670aed5f21f571f3eae743c109a2eba (diff) | |
download | tor-0daad3e44d609b451173d1fdbbb39f28f2d1d461.tar.gz tor-0daad3e44d609b451173d1fdbbb39f28f2d1d461.zip |
Merge branch 'maint-0.2.2' into release-0.2.2
-rw-r--r-- | src/or/control.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c index 5ffe63b724..c1a19ca214 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2845,7 +2845,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; } |