From: Mike Perry <mikeperry-git@torproject.org>
Date: Thu, 8 Aug 2019 17:24:31 +0000 (-0500)
Subject: Bug 30992: Demote logline of wronghop padding to protocol warn.
X-Git-Tag: tor-0.4.1.5~6^2^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6bc9d7c7eff9d50e5499007ea3a742b259e6ff9;p=thirdparty%2Ftor.git

Bug 30992: Demote logline of wronghop padding to protocol warn.

This can happen, it's not great, but it's not the worst thing in the world
either. Deferring full fix for 0.4.2/later.
---

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index 392dc53331..cdebda33f6 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -2907,7 +2907,7 @@ circpad_handle_padding_negotiated(circuit_t *circ, cell_t *cell,
 
   /* Verify this came from the expected hop */
   if (!circpad_padding_is_from_expected_hop(circ, layer_hint)) {
-    log_fn(LOG_WARN, LD_CIRC,
+    log_fn(LOG_PROTOCOL_WARN, LD_CIRC,
            "Padding negotiated cell from wrong hop on circuit %u",
              TO_ORIGIN_CIRCUIT(circ)->global_identifier);
     return -1;