Merge branch 'bug17654_try1'

This commit is contained in:
Nick Mathewson 2015-11-25 12:25:44 -05:00
commit 289b184e11

View File

@ -1480,7 +1480,7 @@ connection_tls_continue_handshake(or_connection_t *conn)
return 0;
}
}
tor_assert(!tor_tls_is_server(conn->tls));
tor_assert(tor_tls_is_server(conn->tls));
return connection_tls_finish_handshake(conn);
case TOR_TLS_WANTWRITE:
connection_start_writing(TO_CONN(conn));