diff options
author | Nick Mathewson <nickm@torproject.org> | 2015-01-06 13:52:54 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-01-06 13:52:54 -0500 |
commit | cf2ac8e2556849fdcace74adf36da876f86af30a (patch) | |
tree | 84a0f7f21309374f148760d0c416c5ae49803575 /src/or/or.h | |
parent | 6f7a8f84d906a0a9d5fd88e49d352bb748a36b09 (diff) | |
parent | 734ba5cb0a0b6cc5376f8889305835224d814252 (diff) | |
download | tor-cf2ac8e2556849fdcace74adf36da876f86af30a.tar.gz tor-cf2ac8e2556849fdcace74adf36da876f86af30a.zip |
Merge remote-tracking branch 'public/feature11791'
Diffstat (limited to 'src/or/or.h')
-rw-r--r-- | src/or/or.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 4a014c1321..3ecb380eec 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3537,6 +3537,8 @@ typedef struct { uint64_t MaxMemInQueues_raw; uint64_t MaxMemInQueues;/**< If we have more memory than this allocated * for queues and buffers, run the OOM handler */ + /** Above this value, consider ourselves low on RAM. */ + uint64_t MaxMemInQueues_low_threshold; /** @name port booleans * |