diff options
| author | teor <teor@torproject.org> | 2019-10-23 08:30:48 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-23 08:30:48 +1000 |
| commit | 27965f1ef2ff44e2ce7e3f1af72f9112fb30bde5 (patch) | |
| tree | 134f8dc4a61163d04c1e30ba8abecd26e348e8b5 | |
| parent | 003be727c4a88c04424cb13429cf36f887e92f5c (diff) | |
| parent | 05fa1689eb96a1249030e1d51828a308d19d728c (diff) | |
| download | tor-27965f1ef2ff44e2ce7e3f1af72f9112fb30bde5.tar.gz tor-27965f1ef2ff44e2ce7e3f1af72f9112fb30bde5.zip | |
Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5
| -rw-r--r-- | changes/bug12399 | 3 | ||||
| -rw-r--r-- | src/feature/rend/rendmid.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug12399 b/changes/bug12399 new file mode 100644 index 0000000000..922c08c5e3 --- /dev/null +++ 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 index fcfa5052cb..3ba48f8858 100644 --- 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; } |