[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

commit 2b6f24665215808ed5c3e366371eaf65f917df8d Merge: b76a161e0 8dffc4674 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 31 14:04:34 2017 -0400

Merge branch '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(-)