commit 896a1ac50b6ab182c1e15cc5271d0b24fcb90a31 Merge: 1203e137b 046183714 Author: teor <teor@torproject.org> Date: Thu Sep 5 14:47:54 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 Makefile.am | 2 +- changes/ticket31554 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)