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/or.h | |
| 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/or.h')
| -rw-r--r-- | src/or/or.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/or.h b/src/or/or.h index cc4e5ed9d8..4727c6ba04 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2825,6 +2825,9 @@ typedef struct circuit_t { * more. */ int deliver_window; + /** Temporary field used during circuits_handle_oom. */ + uint32_t age_tmp; + /** For storage while n_chan is pending (state CIRCUIT_STATE_CHAN_WAIT). */ struct create_cell_t *n_chan_create_cell; @@ -3478,9 +3481,8 @@ 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 - */ + uint64_t MaxMemInQueues; /**< If we have more memory than this allocated + * for queues and buffers, run the OOM handler */ /** @name port booleans * |