commit 37c0542d0d87a288e12c9397593bd890f2964a58 Merge: ed4b8ca74b 7034c8449d Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 15 11:20:06 2021 -0400

Merge remote-tracking branch 'asn-private/hsfuz' into hs_fuzzing

scripts/codegen/fuzzing_include_am.py | 2 + src/feature/hs/hs_descriptor.c | 16 ++--- src/feature/hs/hs_descriptor.h | 19 ++++++ src/test/fuzz/fuzz_hsdescv3_inner.c | 119 ++++++++++++++++++++++++++++++++++ src/test/fuzz/fuzz_hsdescv3_middle.c | 116 +++++++++++++++++++++++++++++++++ src/test/fuzz/include.am | 61 +++++++++++++++++ 6 files changed, 325 insertions(+), 8 deletions(-)