diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-01-03 10:53:22 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-01-03 10:53:22 -0500 |
| commit | 5c45a333c3cdfc4c7a817425a1c3ae88085c389b (patch) | |
| tree | f6a7db91df7b7fc7cb0ce2e31bc9d8bcde549128 /src/or/or.h | |
| parent | 35115496511f64c08849a039c926910739467169 (diff) | |
| parent | 647248729fa65f0e51d062e2af8f4e8b38592bf5 (diff) | |
| download | tor-5c45a333c3cdfc4c7a817425a1c3ae88085c389b.tar.gz tor-5c45a333c3cdfc4c7a817425a1c3ae88085c389b.zip | |
Merge remote-tracking branch 'public/bug10169_023' into bug10169_024
Conflicts:
doc/tor.1.txt
src/or/config.c
src/or/or.h
The conflicts were all pretty trivial.
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 5318b0fe5d..ec7e933492 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2817,6 +2817,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; @@ -3441,9 +3444,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 * |