commit 35156ffcc3a0b1a62df2affabd691349e880156f Merge: 64f65f2 ea72b4f Author: Nick Mathewson <nickm@torproject.org> Date: Wed Sep 17 10:27:40 2014 -0400 Merge remote-tracking branch 'public/ticket_13119_v3' changes/ticket_13119 | 6 + src/test/test.c | 301 ++++--- src/test/test.h | 24 +- src/test/test_addr.c | 424 +++++----- src/test/test_buffers.c | 110 +-- src/test/test_cell_formats.c | 72 +- src/test/test_cell_queue.c | 8 +- src/test/test_circuitlist.c | 2 +- src/test/test_circuitmux.c | 2 +- src/test/test_config.c | 142 ++-- src/test/test_containers.c | 485 +++++------ src/test/test_crypto.c | 336 ++++---- src/test/test_dir.c | 919 +++++++++++---------- src/test/test_entrynodes.c | 14 +- src/test/test_extorport.c | 36 +- src/test/test_hs.c | 16 +- src/test/test_introduce.c | 76 +- src/test/test_microdesc.c | 32 +- src/test/test_nodelist.c | 6 +- src/test/test_policy.c | 114 +-- src/test/test_pt.c | 80 +- src/test/test_replay.c | 119 +-- src/test/test_socks.c | 266 +++--- src/test/test_util.c | 1878 ++++++++++++++++++++++-------------------- 24 files changed, 2777 insertions(+), 2691 deletions(-)