diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-19 14:32:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-19 14:32:42 -0400 |
| commit | e8f547c181e9b86fa590280c579fd3be495824ce (patch) | |
| tree | 942ec7feface5bf921db29178900b3122c78e2d5 /src/or/channeltls.c | |
| parent | 2c2c64287aebe9eaa844457b852ca7cd50c61ec5 (diff) | |
| parent | 3d8b73db553712b2bea4fc74b8f478f1b1b39aee (diff) | |
| download | tor-e8f547c181e9b86fa590280c579fd3be495824ce.tar.gz tor-e8f547c181e9b86fa590280c579fd3be495824ce.zip | |
Merge branch 'block_renegotiate_024'
Diffstat (limited to 'src/or/channeltls.c')
| -rw-r--r-- | src/or/channeltls.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/channeltls.c b/src/or/channeltls.c index af0f096e3f..4e3c20ab71 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1146,6 +1146,7 @@ enter_v3_handshake_with_cell(var_cell_t *cell, channel_tls_t *chan) "Received a cell while TLS-handshaking, not in " "OR_HANDSHAKING_V3, on a connection we originated."); } + connection_or_block_renegotiation(chan->conn); chan->conn->base_.state = OR_CONN_STATE_OR_HANDSHAKING_V3; if (connection_init_or_handshake_state(chan->conn, started_here) < 0) { connection_or_close_for_error(chan->conn, 0); |