diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-29 16:45:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-29 16:45:56 -0400 |
| commit | f113a263deda8e1619f46cd913fc24ac28da832d (patch) | |
| tree | 367b7c8e31b427a1fd83af5cd06daf3217806ede | |
| parent | d6fa8239c86f49413e9ee86765059f43ceeb06c6 (diff) | |
| parent | 41058dce95b4e94c10b156728524d24d69620ed0 (diff) | |
| download | tor-f113a263deda8e1619f46cd913fc24ac28da832d.tar.gz tor-f113a263deda8e1619f46cd913fc24ac28da832d.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
| -rw-r--r-- | changes/bug12996 | 5 | ||||
| -rw-r--r-- | src/or/onion_tap.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/changes/bug12996 b/changes/bug12996 new file mode 100644 index 0000000000..4b4fb0dceb --- /dev/null +++ b/changes/bug12996 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Downgrade "Unexpected onionskin length after decryption" warning + to a protocol-warn, since there's nothing relay operators can do + about a client that sends them a malformed create cell. Resolves + bug 12996; bugfix on 0.0.6rc1. diff --git a/src/or/onion_tap.c b/src/or/onion_tap.c index 9a9f374b93..65f8275f75 100644 --- a/src/or/onion_tap.c +++ b/src/or/onion_tap.c @@ -122,8 +122,9 @@ onion_skin_TAP_server_handshake( "Couldn't decrypt onionskin: client may be using old onion key"); goto err; } else if (len != DH_KEY_LEN) { - log_warn(LD_PROTOCOL, "Unexpected onionskin length after decryption: %ld", - (long)len); + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Unexpected onionskin length after decryption: %ld", + (long)len); goto err; } |