tor

commit 27965f1ef2ff44e2ce7e3f1af72f9112fb30bde5
parent 003be727c4a88c04424cb13429cf36f887e92f5c
Author: teor <teor@torproject.org>
Date:   Wed, 23 Oct 2019 08:30:48 +1000

Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5

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
@@ -70,7 +70,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;
   }