commit 217b8958311421c6819213af01f685160938f5d0 Merge: 7dee70c 34f14a3 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Nov 10 09:16:00 2016 -0500 Merge remote-tracking branch 'dgoulet/ticket19642_030_01' src/or/hs_descriptor.c | 13 +++++++++++++ src/or/hs_descriptor.h | 3 +++ src/or/parsecommon.h | 1 + src/test/test_hs_descriptor.c | 1 + 4 files changed, 18 insertions(+)