diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-08-15 15:36:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-08-15 15:36:04 -0400 |
| commit | d4634d1b72d660b1ea5ce9874fcd6b04a15968e9 (patch) | |
| tree | 57ee2a0b0a1b5c41d13ac455884a826b000c675e /src/or/relay.c | |
| parent | 1743144c341218e4af88423cccd2bf93e72730a1 (diff) | |
| parent | 1555876d5f27acaa9326045e33b6e2bfc1013c7f (diff) | |
| download | tor-d4634d1b72d660b1ea5ce9874fcd6b04a15968e9.tar tor-d4634d1b72d660b1ea5ce9874fcd6b04a15968e9.tar.gz | |
Merge remote-tracking branch 'majek/bug9108'
Conflicts:
src/or/circuitlist.h
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 297f0f69e..9a0fdd963 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2113,7 +2113,7 @@ dump_cell_pool_usage(int severity) circuit_t *c; int n_circs = 0; int n_cells = 0; - for (c = circuit_get_global_list_(); c; c = c->next) { + TOR_LIST_FOREACH(c, circuit_get_global_list_(), head) { n_cells += c->n_chan_cells.n; if (!CIRCUIT_IS_ORIGIN(c)) n_cells += TO_OR_CIRCUIT(c)->p_chan_cells.n; |