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/control.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/control.c')
| -rw-r--r-- | src/or/control.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c index 03b42af53..d624d2879 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1928,7 +1928,7 @@ getinfo_helper_events(control_connection_t *control_conn, if (!strcmp(question, "circuit-status")) { circuit_t *circ_; smartlist_t *status = smartlist_new(); - for (circ_ = circuit_get_global_list_(); circ_; circ_ = circ_->next) { + TOR_LIST_FOREACH(circ_, circuit_get_global_list_(), head) { origin_circuit_t *circ; char *circdesc; const char *state; |