diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-03-15 11:07:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-03-15 11:07:38 -0400 |
| commit | 567a56ae2e59aef26b31829f300c5700c7923f7b (patch) | |
| tree | aeee25b9397f1aff983f7e0210cb95edccb8458f | |
| parent | 92813941b5f467b878485eb3c141c59f48736847 (diff) | |
| parent | ec5fe41209add4b216029466774a6b7e833210ef (diff) | |
| download | tor-567a56ae2e59aef26b31829f300c5700c7923f7b.tar.gz tor-567a56ae2e59aef26b31829f300c5700c7923f7b.zip | |
Merge branch 'bug20059_024_v2' into maint-0.3.0
| -rw-r--r-- | changes/bug20059 | 3 | ||||
| -rw-r--r-- | src/or/onion.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug20059 b/changes/bug20059 new file mode 100644 index 0000000000..091fab06d1 --- /dev/null +++ b/changes/bug20059 @@ -0,0 +1,3 @@ + 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. diff --git a/src/or/onion.c b/src/or/onion.c index 42b9ca4b18..b3898d4085 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -238,7 +238,9 @@ 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."); - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT); + if (! TO_CIRCUIT(circ)->marked_for_close) { + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT); + } } return 0; } |