commit a7762930c38a5bbd096ccc5ef2595b469a462d58 Merge: c1e8dfd a3bbb9c Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 1 09:23:36 2016 -0500

Merge remote-tracking branch 'dgoulet/ticket20568_030_01'

src/or/hs_descriptor.c | 46 ++++--------------------------------------- src/or/hs_descriptor.h | 1 - src/or/torcert.c | 41 ++++++++++++++++++++++++++++++++++++++ src/or/torcert.h | 2 ++ src/test/test_hs_descriptor.c | 2 +- 5 files changed, 48 insertions(+), 44 deletions(-)