commit cf1e6ad2d72696bc788b02c0f51581361f271d67 Merge: 6f9ab69b6 a7ca71cf6 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 13 11:19:09 2017 -0500 Merge branch 'bug24247_032' into maint-0.3.2 changes/bug24247 | 6 ++++++ src/test/fuzz/fuzzing_common.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-)