Merge remote-tracking branch 'majek/bug9108'

Conflicts:
	src/or/circuitlist.h

diff --cc src/or/channel.h
Simple merge

diff --cc src/or/circuitlist.c
index 85bacce485ecda454c9fcf055cbe30a7bc86b916,6bf18590a37bfac4c79606a9209174d460ea788e..a4144e8000ab56e600ed4876d1974a2ff0e0c272
--- 1/src/or/circuitlist.c
--- 2/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 4e56f5264fbb7cd27daf198a5ba4e63de5470f9a,4726b3be5a631ea1d0c8bafc2f1d20c1c7ee8d69..a43315d2381c8539de5280e7a4839994b36f089c
--- 1/src/or/circuitlist.h
--- 2/src/or/circuitlist.h
+++ b/src/or/circuitlist.h
@@@ -12,9 -12,9 +12,11 @@@
  #ifndef TOR_CIRCUITLIST_H
  #define TOR_CIRCUITLIST_H
  
- circuit_t * circuit_get_global_list_(void);
 +#include "testsupport.h"
 +
+ 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);

diff --cc src/or/control.c
Simple merge

diff --cc src/or/or.h
Simple merge

diff --cc src/or/relay.c
Simple merge

diff --cc src/or/rendservice.c
Simple merge