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