Merge remote-tracking branch 'public/bug4592'

changes/bug4592

@@ -0,0 +1,3 @@
+  o Minor bugfixes:
+    - Detect SSL handshake even when the initial attempt to write the
+      server hello fails. Fix for bug 4592; bugfix on 0.2.0.13-alpha.

src/common/tortls.c

@@ -1372,7 +1372,8 @@ tor_tls_server_info_callback(const SSL *ssl, int type, int val)
 
   if (type != SSL_CB_ACCEPT_LOOP)
     return;
-  if (ssl->state != SSL3_ST_SW_SRVR_HELLO_A)
+  if ((ssl->state != SSL3_ST_SW_SRVR_HELLO_A) &&
+      (ssl->state != SSL3_ST_SW_SRVR_HELLO_B))
     return;
 
   tls = tor_tls_get_by_ssl(ssl);