commit 4ee65a6f877e841739f037ad27d2d588ce4e0c51 Merge: 824881218 223afc2d8 Author: David Goulet dgoulet@torproject.org Date: Tue Aug 6 07:42:20 2019 -0400

Merge branch 'tor-github/pr/1193'

Makefile.am | 2 +- changes/ticket31309 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)