torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Browse Source 
Conflicts:
	src/or/or.h
	src/or/relay.c

Conflicts were simple to resolve.  More fixes were needed for
compilation, including: reinstating the tv_to_msec function, and renaming
*_conn_cells to *_chan_cells.
This commit is contained in:
Nick Mathewson
2013-11-15 15:29:24 -05:00
parent a82b18f216 9e90707602
commit 59f50c80d4
6 changed files with 77 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug9093
+7
View File
@@ -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.