From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 11 Jun 2012 14:34:48 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug4592'
X-Git-Tag: tor-0.2.3.17-beta~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=667a12b471fd457dca5f564702da05a2fd9772d4;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug4592'
---

667a12b471fd457dca5f564702da05a2fd9772d4
diff --cc src/common/tortls.c
index a62c2e6a8c,c54ed46f30..b2e43a47d7
--- a/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);