diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-11-15 15:35:00 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-11-15 15:35:00 -0500 |
| commit | 7a2b30fe16eacc040b3dd11f8c39c410628c2f43 (patch) | |
| tree | 356e060be24608160a8e5d4fea33d39cc01a4c46 /changes | |
| parent | 4aa9affec2eac0a95ba026e380718b032451a0af (diff) | |
| parent | 59f50c80d443a7e148f85cfed493e3e703cc4386 (diff) | |
| download | tor-7a2b30fe16eacc040b3dd11f8c39c410628c2f43.tar.gz tor-7a2b30fe16eacc040b3dd11f8c39c410628c2f43.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts:
src/or/relay.c
Conflict changes were easy; compilation fixes required were using
using TOR_SIMPLEQ_FIRST to get head of cell queue.
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug9093 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug9093 b/changes/bug9093 new file mode 100644 index 0000000000..06b6cb926a --- /dev/null +++ b/changes/bug9093 @@ -0,0 +1,7 @@ + o Minor features: + - Improve the circuit queue out-of-memory handler. Previously, when + we ran low on memory, we'd close whichever circuits had the most + queued cells. Now, we close those that have the *oldest* queued + cells, on the theory that those are most responsible for us + running low on memory. Based on analysis from a forthcoming paper + by Jansen, Tschorsch, Johnson, and Scheuermann. Fixes bug 9093.
\ No newline at end of file |