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

[nickm at torproject.org]

commit d63eeb1b69fcc971f3a789eab72cf7c02905067b
Merge: 2a9ffeb47 e75583e71
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 15 10:25:27 2020 -0400

    Merge branch 'maint-0.4.2' into release-0.4.2

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