commit 4af1653e0f5fe305aff340e7b7f47c1f965ef3ca Merge: dfe03a55f c4ef21ff5 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Oct 26 10:43:05 2017 -0400 Merge branch 'maint-0.3.2' changes/bug21509 | 3 +++ scripts/codegen/fuzzing_include_am.py | 1 + src/test/fuzz/fuzz_hsdescv3.c | 4 +++- src/test/fuzz/include.am | 28 +++++++++++++++++++++++++--- 4 files changed, 32 insertions(+), 4 deletions(-)