commit 8dffc46748d758d94369421b13c9e23c1affc6ab Merge: 652d22e60 26e0909e5 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 31 14:04:31 2017 -0400

Merge branch 'hsdescv3_fuzz_more' into maint-0.3.2

changes/hsdescv3_fuzz_more | 3 +++ src/or/hs_descriptor.c | 12 ++++++------ src/or/hs_descriptor.h | 7 +++++++ src/test/fuzz/fuzz_hsdescv3.c | 19 +++++++++++++++++++ 4 files changed, 35 insertions(+), 6 deletions(-)