commit 64c88c71995b5320d3951496b9b8f01ed2cf4a7b Merge: 4f8a0ed62 fc33caada Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 20 09:59:51 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

changes/ticket24425 | 4 ++++ src/or/hs_common.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)