[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm at torproject.org]

commit 3bc580633968ab38ddecb86c866bf95d116afccb
Merge: 8e5450b75 0a1b1430c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 20 10:39:38 2017 -0500

    Merge branch 'maint-0.3.2'

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