commit 83f10c77dabc242c3e28740a4336741ff564b22e Merge: 88d6c2568 593d29920 Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 29 10:15:11 2019 -0400

Merge branch 'maint-0.4.0' into release-0.4.0

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