commit 2824413f40e20bb1c02eb6e180208eca203645f3 Merge: 64c88c719 0a1b1430c Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 20 10:39:38 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

src/test/test_hs_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)