summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-08-29 16:44:50 -0400
committerNick Mathewson <nickm@torproject.org>2014-08-29 16:44:50 -0400
commit41058dce95b4e94c10b156728524d24d69620ed0 (patch)
tree6462c685a07a1e5dbb67df51c4f31956c3e335d0 /src/or
parent4a6f5bb2dda188ed1d1a80455bf9c9b0b3f00066 (diff)
parent7a878c192f5000c5ef5d29a71924a41b6e5adf42 (diff)
downloadtor-41058dce95b4e94c10b156728524d24d69620ed0.tar.gz
tor-41058dce95b4e94c10b156728524d24d69620ed0.zip
Merge remote-tracking branch 'arma/bug12996b' into maint-0.2.5
Diffstat (limited to 'src/or')
-rw-r--r--src/or/onion_tap.c5
1 files changed, 3 insertions, 2 deletions
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;
}