commit d4634d1b72d660b1ea5ce9874fcd6b04a15968e9 Merge: 1743144 1555876 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 15 15:36:04 2013 -0400

Merge remote-tracking branch 'majek/bug9108'

Conflicts: src/or/circuitlist.h

changes/bug9108 | 3 ++ src/or/channel.h | 1 - src/or/circuitbuild.c | 9 +---- src/or/circuitlist.c | 94 ++++++++++++++++--------------------------------- src/or/circuitlist.h | 4 ++- src/or/circuituse.c | 30 ++++++---------- src/or/control.c | 2 +- src/or/onion.c | 1 - src/or/or.h | 3 +- src/or/relay.c | 2 +- src/or/rendclient.c | 2 +- src/or/rendservice.c | 4 +-- src/or/rephist.c | 2 +- src/or/status.c | 2 +- 14 files changed, 57 insertions(+), 102 deletions(-)

diff --cc src/or/circuitlist.c index 85bacce,6bf1859..a4144e8 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@@ -682,9 -653,8 +652,9 @@@ init_circuit_base(circuit_t *circ

circ->package_window = circuit_initial_package_window(); circ->deliver_window = CIRCWINDOW_START; + cell_queue_init(&circ->n_chan_cells);

- circuit_add(circ); + TOR_LIST_INSERT_HEAD(&global_circuitlist, circ, head); }

/** Allocate space for a new circuit, initializing with <b>p_circ_id</b> diff --cc src/or/circuitlist.h index 4e56f52,4726b3b..a43315d --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@@ -12,9 -12,9 +12,11 @@@ #ifndef TOR_CIRCUITLIST_H #define TOR_CIRCUITLIST_H

+#include "testsupport.h" + - circuit_t * circuit_get_global_list_(void); + TOR_LIST_HEAD(global_circuitlist_s, circuit_t); + + struct global_circuitlist_s* circuit_get_global_list_(void); const char *circuit_state_to_string(int state); const char *circuit_purpose_to_controller_string(uint8_t purpose); const char *circuit_purpose_to_controller_hs_state_string(uint8_t purpose);