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 'public/bug10169_024' into bug10169_025_v2

Browse Source 
Conflicts:
	src/or/circuitlist.c
This commit is contained in:
Nick Mathewson
2014-02-12 12:44:58 -05:00
parent 10d4d3e2d5 05d8111eed
commit 87fb1e324c
9 changed files with 207 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug10169
+4
View File
@@ -0,0 +1,4 @@
o Major features:
- Also consider stream buffer sizes when calculating OOM
conditions. Rename MaxMemInCellQueues to MaxMemInQueues. Fixes
bug 10169.
changes/bug9686
+3
View File
@@ -0,0 +1,3 @@
o Minor changes:
- Decrease the lower limit of MaxMemInQueues to 256 MBytes, to
appease raspberry pi users. Fixes bug 9686.