diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-04-25 10:43:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-04-25 10:43:53 -0400 |
| commit | ec7c512d272d366e8e7de61aaf8108bca0adf957 (patch) | |
| tree | 1231bd098d063b4f88ba92032a1019765b22764c | |
| parent | 6bf82a4910db3f20c2cb81d7569224f4322681f2 (diff) | |
| parent | 368b0913293dec9b392bce288753f5d90c130431 (diff) | |
| download | tor-ec7c512d272d366e8e7de61aaf8108bca0adf957.tar.gz tor-ec7c512d272d366e8e7de61aaf8108bca0adf957.zip | |
Merge remote-tracking branch 'dgoulet/bug21293_031_01'
| -rw-r--r-- | changes/bug21293 | 5 | ||||
| -rw-r--r-- | src/or/relay.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug21293 b/changes/bug21293 new file mode 100644 index 0000000000..23a7547951 --- /dev/null +++ b/changes/bug21293 @@ -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. diff --git a/src/or/relay.c b/src/or/relay.c index 8524080939..1842012ed7 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -226,7 +226,8 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ, return 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; } |