[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1

commit d6d3f8486dbac9837a793f431dcd58505e7274e4 Merge: 340fcc7e2 fcd26af7c Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jun 26 09:21:59 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/feature26372_029 | 4 ++++ configure.ac | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)