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 /src/or/relay.c | |
| parent | 35115496511f64c08849a039c926910739467169 (diff) | |
| parent | 647248729fa65f0e51d062e2af8f4e8b38592bf5 (diff) | |
| download | tor-5c45a333c3cdfc4c7a817425a1c3ae88085c389b.tar.gz tor-5c45a333c3cdfc4c7a817425a1c3ae88085c389b.zip | |
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 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 63119cbf07..01143f418d 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2243,7 +2243,8 @@ static int cell_queues_check_size(void) { size_t alloc = total_cells_allocated * packed_cell_mem_cost(); - if (alloc >= get_options()->MaxMemInCellQueues) { + alloc += buf_get_total_allocation(); + if (alloc >= get_options()->MaxMemInQueues) { circuits_handle_oom(alloc); return 1; } |