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

[nickm at torproject.org]

commit 768ffb8f43575baac0970659b01e0a484d6bd6de
Merge: 72312cdbb a59d54756
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 15 10:25:27 2020 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.1

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