diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-09-02 14:11:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-09-02 14:11:18 -0400 |
| commit | e3a458e441fe9f823d564ca66753e3b76c7c0943 (patch) | |
| tree | 7f5a813c244722f882d319adc26e98efa62e89df | |
| parent | 25e7fc5b7a84c926f3acebd385e97d2679097bd6 (diff) | |
| parent | 05fa1689eb96a1249030e1d51828a308d19d728c (diff) | |
| download | tor-e3a458e441fe9f823d564ca66753e3b76c7c0943.tar.gz tor-e3a458e441fe9f823d564ca66753e3b76c7c0943.zip | |
Merge branch 'ticket12399_035' into maint-0.4.1
| -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 849f355990..421e0f2139 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; } |