commit b1212cd7ba949f2328b9c09ed7498535381bdf19 Merge: 0d3d2f2e1 864564725 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 17 14:49:23 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

changes/bug26789 | 4 ++ scripts/codegen/fuzzing_include_am.py | 8 ++++ src/test/fuzz/include.am | 79 ++++++++++++++++++++++++++++++++++- src/test/include.am | 2 + 4 files changed, 91 insertions(+), 2 deletions(-)