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