diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-11-25 12:25:44 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-11-25 12:25:44 -0500 |
| commit | 289b184e112885d4feb9569c77d322995b9417c7 (patch) | |
| tree | d869bebccf47067bf4dfae69c21abff64304c905 | |
| parent | 5dff4ae0ad5e2a1fb93ceae3446f0a315fbd8a3a (diff) | |
| parent | dce708d11c4ec94ece2fd49b6b697df759f93ef1 (diff) | |
| download | tor-289b184e112885d4feb9569c77d322995b9417c7.tar.gz tor-289b184e112885d4feb9569c77d322995b9417c7.zip | |
Merge branch 'bug17654_try1'
| -rw-r--r-- | src/or/connection_or.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 59dea37abd..08962bd4db 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -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)); |