Merge branch 'maint-0.2.2' into release-0.2.2

2012-05-10 17:57:16 -04:00 · 2012-05-10 17:57:16 -04:00 · 0daad3e44d
parent d06ea86850 436654ee96
commit 0daad3e44d
1 changed files with 2 additions and 1 deletions
--- 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;
  }