commit 9944fd92ceaa1614d6a54e47c39c2670c4fd66af Merge: 4d5e8378b 6be0e2867 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Aug 21 14:20:38 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23233 | 4 + src/or/hs_descriptor.c | 5 +- src/test/test_hs_descriptor.c | 31 ++++++ src/test/test_hs_descriptor.inc | 224 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 262 insertions(+), 2 deletions(-)