tor

commit 01bda9bed1bbbeb808053ff9b23e5db4e10dd765
parent f538e2398698d4aa05b65bba857260fed9126ef3
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon,  2 Sep 2019 14:11:32 -0400

Merge branch 'maint-0.4.1'

Diffstat:
A
changes/bug12399
 | 
3
+++
M
src/feature/rend/rendmid.c
 | 
3
++-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/bug12399 b/changes/bug12399
@@ -0,0 +1,3 @@
+  o Minor bugfixes (logging):
+    - Change log level of message "Hash of session info was not as expected"
+      to LOG_PROTOCOL_WARN. Fixes bug 12399; bugfix on 0.1.1.10-alpha.
diff --git a/src/feature/rend/rendmid.c b/src/feature/rend/rendmid.c
@@ -71,7 +71,8 @@ rend_mid_establish_intro_legacy(or_circuit_t *circ, const uint8_t *request,
     goto err;
   }
   if (tor_memneq(expected_digest, request+2+asn1len, DIGEST_LEN)) {
-    log_warn(LD_PROTOCOL, "Hash of session info was not as expected.");
+    log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+           "Hash of session info was not as expected.");
     reason = END_CIRC_REASON_TORPROTOCOL;
     goto err;
   }