commit bd432bbac5902b7baec4fcd39bc807e8e8339102 Merge: d05780c1b 7d767706e Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 6 13:01:56 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24150 | 4 ++++ src/or/hs_descriptor.c | 11 ++++++++++- src/test/fuzz/fuzz_hsdescv3.c | 8 +++++++- 3 files changed, 21 insertions(+), 2 deletions(-)