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

[nickm at torproject.org]

commit e75583e71bf87ce6d40a801396cf3def39a60c45
Merge: b8bff426f 768ffb8f4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 15 10:25:27 2020 -0400

    Merge branch 'maint-0.4.1' into maint-0.4.2

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)