commit 1dcaeab46675b4979d48939772bebcb84299e04f Merge: 52a82bc53 5c2212c73 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 29 14:49:15 2018 -0400

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

src/feature/hs/hs_descriptor.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-)