commit abedd35de08f2a2bd91d9d17e2f3cfd3b42ba52a Merge: 27ec1fa 1e78100 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jul 18 11:24:57 2013 -0400 Merge branch 'simpleq_for_cells_3' src/or/circuitlist.c | 4 +- src/or/circuitlist.h | 1 + src/or/circuitmux.c | 2 +- src/or/or.h | 8 ++- src/or/relay.c | 42 ++++++------- src/or/relay.h | 3 + src/test/include.am | 1 + src/test/test.c | 2 + src/test/test_cell_queue.c | 146 ++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 181 insertions(+), 28 deletions(-)