commit 547522f56958d0b77aee48dcf0fbc87b7a26f800 Merge: 0cc4152b0 571cb2f66 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug27081 | 4 ++++ configure.ac | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)