[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug4361'

[nickm at torproject.org]

commit 3fc3ed50a1308a1d92ea5d15f9cc4e208efbf681
Merge: 5daa765 248b967
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 8 14:23:52 2012 -0500

    Merge remote-tracking branch 'public/bug4361'
    
    Conflicts:
    	src/or/command.c

 changes/bug4361  |    4 ++++
 src/or/command.c |   24 ++++++++++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --cc src/or/command.c
index eb11a95,e61fef7..fb281a7
--- a/src/or/command.c
+++ b/src/or/command.c
@@@ -1092,7 -1048,16 +1099,16 @@@ command_process_certs_cell(var_cell_t *
      id_cert = auth_cert = NULL;
    }
  
 -  conn->handshake_state->received_cert_cell = 1;
 +  conn->handshake_state->received_certs_cell = 1;
+ 
+   if (send_netinfo) {
+     if (connection_or_send_netinfo(conn) < 0) {
+       log_warn(LD_OR, "Couldn't send netinfo cell");
+       connection_mark_for_close(TO_CONN(conn));
+       goto err;
+     }
+   }
+ 
   err:
    tor_cert_free(id_cert);
    tor_cert_free(link_cert);