diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-01-03 10:53:22 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-01-03 10:53:22 -0500 |
| commit | 5c45a333c3cdfc4c7a817425a1c3ae88085c389b (patch) | |
| tree | f6a7db91df7b7fc7cb0ce2e31bc9d8bcde549128 /changes | |
| parent | 35115496511f64c08849a039c926910739467169 (diff) | |
| parent | 647248729fa65f0e51d062e2af8f4e8b38592bf5 (diff) | |
| download | tor-5c45a333c3cdfc4c7a817425a1c3ae88085c389b.tar tor-5c45a333c3cdfc4c7a817425a1c3ae88085c389b.tar.gz | |
Merge remote-tracking branch 'public/bug10169_023' into bug10169_024
Conflicts:
doc/tor.1.txt
src/or/config.c
src/or/or.h
The conflicts were all pretty trivial.
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 000000000..979c4e428 --- /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 000000000..82a8f4447 --- /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 |