commit 6fcb94beadfa4523271abc83e82dc523deda8be7 Merge: 34feedea60 fcf5bbb59f Author: David Goulet <dgoulet@torproject.org> Date: Wed Nov 18 11:29:08 2020 -0500 Merge branch 'maint-0.4.5' into master configure.ac | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)