commit 36e62ae7e2e3d7fdec074a6dd5d6d2dfa9871a9f Merge: 33a2fd0 e0a3819 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 27 10:12:48 2017 -0400

Merge remote-tracking branch 'ahf/bugs/22085'

src/test/fuzz/fuzz_http.c | 4 +- src/test/test_buffers.c | 146 +++++++++++-------- src/test/test_extorport.c | 4 +- src/test/test_helpers.c | 4 +- src/test/test_helpers.h | 2 +- src/test/test_util.c | 362 +++++++++++----------------------------------- 6 files changed, 171 insertions(+), 351 deletions(-)