Commit 8500f0e4 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9

parents 2b94b0ea ec5fe412

changes/bug20059

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (relay):

    - Avoid a double-marked-circuit warning that can happen when we receive

      DESTROY cells under heavy load. Fixes bug 20059; bugfix on 0.1.0.1-rc.

src/or/onion.c

+3 −1
Original line number Diff line number Diff line
@@ -235,8 +235,10 @@ onion_pending_add(or_circuit_t *circ, create_cell_t *onionskin) 
    onion_queue_entry_remove(head);

    log_info(LD_CIRC,

             "Circuit create request is too old; canceling due to overload.");

    if (! TO_CIRCUIT(circ)->marked_for_close) {

      circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT);

    }

  }

  return 0;

}