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

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.2' into maint-0.4.3

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