commit 21531f35f3c6d7d7a86f474e5a2a4ff02388bea0 Merge: 74c059596 394528241 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 6 09:19:05 2019 -0400

Merge branch 'ticket31311_041' into maint-0.4.1

Makefile.am | 9 ++++++--- changes/ticket31311 | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-)