commit 75eaca4e810fcabffea3b23b2ab9460fac020aa5 Merge: 3205700bc eb677c587 Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 28 09:54:39 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

src/test/test_hs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)