Merge remote-tracking branch 'origin/maint-0.2.2'

diff --cc src/or/control.c
index 397bb53ab42677d62cd05f77f7146cfc025334b6,5ffe63b724d9e018342fe119c407aa80560455a2..ec0bb8a7c16994b1e1db0bbf58ca76bcb69912ce
--- 1/src/or/control.c
--- 2/src/or/control.c
+++ b/src/or/control.c
@@@ -3017,10 -2870,9 +3017,10 @@@ handle_control_authchallenge(control_co
  
      if (base16_decode(client_nonce, client_nonce_len,
                        cp, client_nonce_encoded_len) < 0) {
-       connection_write_str_to_buf("513 Invalid base16 client nonce",
+       connection_write_str_to_buf("513 Invalid base16 client nonce\r\n",
                                    conn);
        connection_mark_for_close(TO_CONN(conn));
 +      tor_free(client_nonce);
        return -1;
      }