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

[teor at torproject.org]

commit 71e72ce9caa5e7ed07f475a8ed1b40fce46c86d5
Merge: 958f6eb5c 2d34d4d1a
Author: teor <teor at torproject.org>
Date:   Thu Apr 9 19:43:24 2020 +1000

    Merge branch 'maint-0.4.2' into release-0.4.2

 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)