commit 667a12b471fd457dca5f564702da05a2fd9772d4 Merge: 7091047 e3243ad Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 11 10:34:48 2012 -0400

Merge remote-tracking branch 'public/bug4592'

changes/bug4592 | 3 +++ src/common/tortls.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-)

diff --cc src/common/tortls.c index a62c2e6,c54ed46..b2e43a4 --- 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);