[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm@xxxxxxxxxxxxxx]

commit 8c09923f20379619adc58765a795920435a96822
Merge: 98a30da 5bbf04d
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu May 10 11:50:14 2012 -0400

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

 changes/bug5760  |    3 +++
 src/or/control.c |   10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --cc src/or/control.c
index 397bb53,5ffe63b..ec0bb8a
--- a/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;
      }
  

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits