nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'dgoulet/bug21293_031_01'

Browse Source
This commit is contained in:
Nick Mathewson 2017-04-25 10:43:53 -04:00
commit ec7c512d27
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug21293 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (cell, logging):
- Downgrade a log statement from bug to protocol warning because there is
at least one use case where it can be triggered by a buggy tor
implementation on the Internet for instance. Fixes bug 21293; bugfix on
tor-0.1.1.14-alpha.

3
src/or/relay.c
View File

@ -226,7 +226,8 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ,
return 0; return 0;
if (relay_crypt(circ, cell, cell_direction, &layer_hint, &recognized) < 0) { if (relay_crypt(circ, cell, cell_direction, &layer_hint, &recognized) < 0) {
log_warn(LD_BUG,"relay crypt failed. Dropping connection."); log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
"relay crypt failed. Dropping connection.");
return -END_CIRC_REASON_INTERNAL; return -END_CIRC_REASON_INTERNAL;
} }