commit 18bc7fa70bd277d8284a8f245e54dd54b7a0c529 Merge: ef6ed0f21 97347b110 Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 28 13:46:24 2017 -0400

Merge remote-tracking branch 'haxxpop/fuzzing-hsv3'

scripts/codegen/fuzzing_include_am.py | 1 + src/or/torcert.c | 12 +++--- src/or/torcert.h | 11 +++--- src/test/fuzz/dict/hsdescv3 | 6 +++ src/test/fuzz/fuzz_hsdescv3.c | 71 +++++++++++++++++++++++++++++++++++ src/test/fuzz/include.am | 23 ++++++++++++ 6 files changed, 113 insertions(+), 11 deletions(-)