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