commit 37320bce064730b111018d255009390d887a8a17 Merge: 264c5312e f0f3f3338 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Oct 18 12:42:56 2019 -0400 Merge branch 'maint-0.4.2' changes/bug32124 | 7 +++++++ configure.ac | 17 ++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-)