commit 4a03851e42afcb75525b4c4ca2331e75fb19fadf Merge: 2d42648ea 094294dbb Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 13 13:42:06 2018 +0100

Merge branch 'maint-0.3.2' into release-0.3.2

changes/bug25474 | 5 +++++ configure.ac | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)