Commit a8580a68 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.3.4' into maint-0.3.5

parents f0408b84 761f1bf7

changes/bug29029

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (logging, onion services):

    - Stop logging "Tried to establish rendezvous on non-OR circuit..." as

      a warning. Instead, log it as a protocol warning, because there is

      nothing that relay operators can do to fix it. Fixes bug 29029;

      bugfix on 0.2.5.7-rc.

src/feature/rend/rendmid.c

+3 −3
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const uint8_t *request, 
           (unsigned)circ->p_circ_id);



  if (circ->base_.purpose != CIRCUIT_PURPOSE_OR) {

    log_warn(LD_PROTOCOL,

    log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,

           "Tried to establish rendezvous on non-OR circuit with purpose %s",

           circuit_purpose_to_string(circ->base_.purpose));

    goto err;