[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.0'

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