commit 2367b1ed319a138c40708f511cd6d5575109cece Merge: 01c5d4583 56b7407a9 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Nov 15 15:11:30 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24279 | 5 +++++ configure.ac | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)