commit b17e3f6a3a762de9a26c90385dddc36a9f4751d0 Merge: 221be3651 896a1ac50 Author: teor <teor@torproject.org> Date: Thu Sep 5 14:47:58 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 Makefile.am | 2 +- changes/ticket31554 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)