From df03e9b7376032f801e10874a97d83ac17490f68 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 1 May 2014 12:40:33 -0400
Subject: have only one code path for #9635 logging

---
 src/or/onion_ntor.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/or')

diff --git a/src/or/onion_ntor.c b/src/or/onion_ntor.c
index b91ecbee3..ef501f69d 100644
--- a/src/or/onion_ntor.c
+++ b/src/or/onion_ntor.c
@@ -291,11 +291,8 @@ onion_skin_ntor_client_handshake(
 
   memwipe(&s, 0, sizeof(s));
 
-  if (bad & 4) {
-    log_warn(LD_PROTOCOL, "Incorrect digest from ntor circuit extension "
-             "request.");
-  } else if (bad) {
-    log_warn(LD_PROTOCOL, "Invalid result from curve25519 handshake");
+  if (bad) {
+    log_warn(LD_PROTOCOL, "Invalid result from curve25519 handshake: %d", bad);
   }
 
   return bad ? -1 : 0;
-- 
cgit v1.2.3