From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 15 Aug 2013 19:36:04 +0000 (-0400)
Subject: Merge remote-tracking branch 'majek/bug9108'
X-Git-Tag: tor-0.2.5.1-alpha~64
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4634d1b72d660b1ea5ce9874fcd6b04a15968e9;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'majek/bug9108'

Conflicts:
	src/or/circuitlist.h
---

d4634d1b72d660b1ea5ce9874fcd6b04a15968e9
diff --cc src/or/circuitlist.c
index 85bacce485,6bf18590a3..a4144e8000
--- 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 4e56f5264f,4726b3be5a..a43315d238
--- 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);