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/command.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/command.c')
| -rw-r--r-- | src/or/command.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/or/command.c b/src/or/command.c index c4a0f9baeb..719b10736b 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -398,7 +398,6 @@ command_process_created_cell(cell_t *cell, channel_t *chan) log_debug(LD_OR,"at OP. Finishing handshake."); if ((err_reason = circuit_finish_handshake(origin_circ, &extended_cell.created_cell)) < 0) { - log_warn(LD_OR,"circuit_finish_handshake failed."); circuit_mark_for_close(circ, -err_reason); return; } |