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/rendclient.c | |
| parent | 1743144c341218e4af88423cccd2bf93e72730a1 (diff) | |
| parent | 1555876d5f27acaa9326045e33b6e2bfc1013c7f (diff) | |
| download | tor-d4634d1b72d660b1ea5ce9874fcd6b04a15968e9.tar.gz tor-d4634d1b72d660b1ea5ce9874fcd6b04a15968e9.zip | |
Merge remote-tracking branch 'majek/bug9108'
Conflicts:
src/or/circuitlist.h
Diffstat (limited to 'src/or/rendclient.c')
| -rw-r--r-- | src/or/rendclient.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 7115bf2080..ea4512d091 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -358,7 +358,7 @@ rend_client_close_other_intros(const char *onion_address) { circuit_t *c; /* abort parallel intro circs, if any */ - for (c = circuit_get_global_list_(); c; c = c->next) { + TOR_LIST_FOREACH(c, circuit_get_global_list_(), head) { if ((c->purpose == CIRCUIT_PURPOSE_C_INTRODUCING || c->purpose == CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT) && !c->marked_for_close && CIRCUIT_IS_ORIGIN(c)) { |