diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-24 10:31:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-24 10:31:38 -0400 |
| commit | 67aa3685e7321322cbbc2bef7f87c9a885819af8 (patch) | |
| tree | 46f3678112d650aea4f628b2dd4fe1d7c39c6be0 /src/or/or.h | |
| parent | aa1ad30fc9c629eea44d715041f29e4838ff3175 (diff) | |
| parent | e3af72647db51e99186b9f284066dedcdc8c10d6 (diff) | |
| download | tor-67aa3685e7321322cbbc2bef7f87c9a885819af8.tar.gz tor-67aa3685e7321322cbbc2bef7f87c9a885819af8.zip | |
Merge branch 'bug11396_v2_squashed'
Conflicts:
src/or/main.c
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index 4ca7ecc605..701877c64b 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3491,7 +3491,10 @@ typedef struct { config_line_t *DirPort_lines; config_line_t *DNSPort_lines; /**< Ports to listen on for DNS requests. */ - uint64_t MaxMemInQueues; /**< If we have more memory than this allocated + /* MaxMemInQueues value as input by the user. We clean this up to be + * MaxMemInQueues. */ + uint64_t MaxMemInQueues_raw; + uint64_t MaxMemInQueues;/**< If we have more memory than this allocated * for queues and buffers, run the OOM handler */ /** @name port booleans |