sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.9' into release-0.2.9

This commit is contained in:
Nick Mathewson 2017-08-01 11:28:39 -04:00
parent 50b8a449b5 8500f0e4e1
commit 9191069891
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.

4
src/or/onion.c
View File

@ -235,7 +235,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;
}