commit 8683c5653244d8ae58b9a569594f14534b31216a Merge: 882f69eb0 a26a2735b Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 15 12:20:57 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

changes/bug27081 | 4 ++++ configure.ac | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)