diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-02 16:31:32 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-02 16:31:32 -0500 |
| commit | d03e1da232ada2e0d3a3de3dbf6885caec74e4e0 (patch) | |
| tree | cd3fc872abd2f7fa80af365887a0ea87564199b8 /src/or/relay.c | |
| parent | 3b96bf68315083f83a5f807ccf6f41feafeeb445 (diff) | |
| parent | 41ba4f5627326e1745f0eea143f038677170c596 (diff) | |
| download | tor-d03e1da232ada2e0d3a3de3dbf6885caec74e4e0.tar.gz tor-d03e1da232ada2e0d3a3de3dbf6885caec74e4e0.zip | |
Merge remote-tracking branch 'public/bug9635_warnings_025'
Conflicts:
src/test/test.c
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 8653d8c461..c83d9249ff 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1646,8 +1646,9 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, } if ((reason = circuit_finish_handshake(TO_ORIGIN_CIRCUIT(circ), &extended_cell.created_cell)) < 0) { - log_warn(domain,"circuit_finish_handshake failed."); - return reason; + circuit_mark_for_close(circ, -reason); + return 0; /* We don't want to cause a warning, so we mark the circuit + * here. */ } } if ((reason=circuit_send_next_onion_skin(TO_ORIGIN_CIRCUIT(circ)))<0) { |