[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket21980_031_01'

[nickm at torproject.org]

commit 4cefda85e42c39a9455c04b6d2f2e10b491b975b
Merge: d949589 e1a59ad
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 24 12:42:11 2017 -0400

    Merge remote-tracking branch 'dgoulet/ticket21980_031_01'

 src/or/hs_common.c         | 42 ++++++++++++++++++++++++++++++++++++++++++
 src/or/hs_common.h         | 22 ++++++++++++++++++++++
 src/test/test_hs_service.c | 44 +++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 107 insertions(+), 1 deletion(-)