mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 15:10:48 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.3.0'

Browse source
This commit is contained in:
Nick Mathewson 2017-03-15 11:09:22 -04:00
commit 3b2d6da453
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changes/bug20059 Normal file
View file

@ -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.

2
src/or/onion.c
View file

@ -238,8 +238,10 @@ onion_pending_add(or_circuit_t *circ, create_cell_t *onionskin)
onion_queue_entry_remove(head); onion_queue_entry_remove(head);
log_info(LD_CIRC, log_info(LD_CIRC,
"Circuit create request is too old; canceling due to overload."); "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); circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT);
} }
}
return 0; return 0;
} }