commit 593d29920e264180a7a6849fc59224a8869388d7 Merge: a39789a02 1788343af Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 29 10:15:03 2019 -0400

Merge remote-tracking branch 'tor-github/pr/974' into maint-0.4.0

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