diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-12 12:44:58 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-12 12:44:58 -0500 |
| commit | 87fb1e324c1b3214765c46bec3d9ec6adc3fa83d (patch) | |
| tree | 000e1e6d7d42f160bbd77aaf786a65971696ef19 /src/or/relay.c | |
| parent | 10d4d3e2d58f94418ca9554aee251232bbaaab99 (diff) | |
| parent | 05d8111eedee9e11e4bb1c42e93ae2fc168d52ec (diff) | |
| download | tor-87fb1e324c1b3214765c46bec3d9ec6adc3fa83d.tar.gz tor-87fb1e324c1b3214765c46bec3d9ec6adc3fa83d.zip | |
Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2
Conflicts:
src/or/circuitlist.c
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 94016b49f9..041a9e8b5c 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2205,7 +2205,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; } |