Merge remote-tracking branch 'public/bug4592'

diff --cc src/common/tortls.c
index a62c2e6a8cb1218f6317fc673bf0d599b33e6fd5,c54ed46f305e5b70a51447371c2fe26b94f53e6e..b2e43a47d7ab25ca34cd0c2bf616fd5145898222
--- 1/src/common/tortls.c
--- 2/src/common/tortls.c
+++ b/src/common/tortls.c
@@@ -1367,12 -949,10 +1367,13 @@@ tor_tls_server_info_callback(const SSL 
  {
    tor_tls_t *tls;
    (void) val;
 +
 +  tor_tls_debug_state_callback(ssl, type, 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);