Merge remote-tracking branch 'public/bug4361'

Conflicts:
	src/or/command.c

diff --cc src/or/command.c
index eb11a958e1e35c656c012c5af4f031cbe5d7a447,e61fef7c2eae2ffca7b668f267776b6a0e99c8b9..fb281a7f93044cfa042d21c9be91b1e0c837f7d8
--- 1/src/or/command.c
--- 2/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);