[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0

[nickm at torproject.org]

commit d97548a6fa09d418b93a70b5763e7b9ebe692fb6
Merge: ba8c3735f 34183f0d7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 21 09:10:34 2019 -0500

    Merge branch 'maint-0.4.0' into release-0.4.0

 src/test/include.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)