From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 8 Mar 2012 19:23:52 +0000 (-0500)
Subject: Merge remote-tracking branch 'public/bug4361'
X-Git-Tag: tor-0.2.3.13-alpha~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fc3ed50a1308a1d92ea5d15f9cc4e208efbf681;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug4361'

Conflicts:
	src/or/command.c
---

3fc3ed50a1308a1d92ea5d15f9cc4e208efbf681
diff --cc src/or/command.c
index eb11a958e1,e61fef7c2e..fb281a7f93
--- 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);