commit 206d28ff152f2df5ccf966a5923804718f49b43b Merge: efeb101b9 593d29920 Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 29 10:15:11 2019 -0400

Merge branch 'maint-0.4.0'

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