commit ffd857bbe125b6be442555079a15c896c0317c91 Merge: 40a22fb70 3e4526059 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 26 14:36:37 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1308'

changes/ticket31589 | 2 ++ scripts/maint/practracker/exceptions.txt | 2 +- src/feature/hs/hs_descriptor.c | 21 ++++++++++++--------- src/feature/hs/hs_descriptor.h | 5 ++--- src/test/fuzz/fuzz_hsdescv3.c | 11 ++++++++--- 5 files changed, 25 insertions(+), 16 deletions(-)