[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

commit c5bb554e77ffe2e77a785be5ab055f628f3c476e Merge: 68181dc26 8dffc4674 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 31 14:04:34 2017 -0400

Merge branch 'maint-0.3.2' into release-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(-)