commit a816742f3736adf29cb49253c1b8f3ba6af1eca2 Merge: 6210c7507 630bb113a Author: David Goulet <dgoulet@torproject.org> Date: Wed Sep 4 08:33:28 2019 -0400 Merge branch 'maint-0.4.1' Makefile.am | 2 +- changes/ticket31554 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)