diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-04 11:03:30 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-04 11:03:30 -0500 |
| commit | ab225aaf28d7a25a58b5f11f1c59ded80570b594 (patch) | |
| tree | 2cef1ba108879d507296d6a089f9cebc5237fad8 /changes | |
| parent | bfa0e022bc6ec629473d3dfb598cad698ceee256 (diff) | |
| parent | bb375442141b4a5b301212394ce3e106cb34daf2 (diff) | |
| download | tor-ab225aaf28d7a25a58b5f11f1c59ded80570b594.tar.gz tor-ab225aaf28d7a25a58b5f11f1c59ded80570b594.zip | |
Merge branch 'bug10169_025_v2'
Conflicts:
src/test/test.c
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug10169 | 4 | ||||
| -rw-r--r-- | changes/bug9686 | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug10169 b/changes/bug10169 new file mode 100644 index 0000000000..979c4e4288 --- /dev/null +++ b/changes/bug10169 @@ -0,0 +1,4 @@ + o Major features: + - Also consider stream buffer sizes when calculating OOM + conditions. Rename MaxMemInCellQueues to MaxMemInQueues. Fixes + bug 10169. diff --git a/changes/bug9686 b/changes/bug9686 new file mode 100644 index 0000000000..82a8f44471 --- /dev/null +++ b/changes/bug9686 @@ -0,0 +1,3 @@ + o Minor changes: + - Decrease the lower limit of MaxMemInQueues to 256 MBytes, to + appease raspberry pi users. Fixes bug 9686.
\ No newline at end of file |