Unverified Commit 27965f1e authored by teor's avatar teor
Browse files

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

parents 003be727 05fa1689

changes/bug12399

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

src/feature/rend/rendmid.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

  }