diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-06-18 10:25:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-06-18 10:25:30 -0400 |
| commit | b5d1fded3dfa836ef1f45f6acb74971f75d5caa9 (patch) | |
| tree | ce22de55ffa508033064f7e6165590c00028f459 /src/or/or.h | |
| parent | 2974c83735d2ac473fcffea0ff3b453e900d5854 (diff) | |
| parent | efa342f5fa2c6700ed8273557b7fb39bdc577120 (diff) | |
| download | tor-b5d1fded3dfa836ef1f45f6acb74971f75d5caa9.tar.gz tor-b5d1fded3dfa836ef1f45f6acb74971f75d5caa9.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index c360a37360..67478a183f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3442,6 +3442,10 @@ typedef struct { config_line_t *DirPort_lines; config_line_t *DNSPort_lines; /**< Ports to listen on for DNS requests. */ + uint64_t MaxMemInCellQueues; /**< If we have more memory than this allocated + * for circuit cell queues, run the OOM handler + */ + /** @name port booleans * * Derived booleans: True iff there is a non-listener port on an AF_INET or |