commit a4190d44fa744707229f0ca737bddec36f9aae8c Merge: 7c360ee75 eacfd2911 Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 23 17:49:29 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

src/or/hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)