commit b51ce907771d3fbeeb2dcba3c109d3ee25850f4c Merge: b6c8a14 3866792 Author: Nick Mathewson nickm@torproject.org Date: Thu May 1 12:29:31 2014 -0400

Merge remote-tracking branch 'public/valgrind_tests'

changes/bug11618 | 5 +++++ src/or/networkstatus.c | 3 ++- src/or/networkstatus.h | 4 ++++ src/or/statefile.c | 29 ++++++++++++++++++++++------- src/or/statefile.h | 2 ++ src/test/test.c | 24 ++++++++++++++++++------ src/test/test_buffers.c | 1 + src/test/test_config.c | 18 ++++++++++++++---- src/test/test_controller_events.c | 21 +++++++++++++++------ src/test/test_dir.c | 17 +++++++++++------ src/test/test_extorport.c | 1 + src/test/test_microdesc.c | 1 + src/test/test_oom.c | 11 +++++++++++ src/test/test_policy.c | 2 ++ src/test/test_pt.c | 17 ++++++++++++++++- src/test/test_routerkeys.c | 1 + src/test/test_status.c | 19 ++++++++++++------- src/test/test_util.c | 5 +++++ 18 files changed, 143 insertions(+), 38 deletions(-)