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

[nickm at torproject.org]

commit e8fdba198eaf3c8d2a622bc02831e3533748c3f5
Merge: ae1ebb5f4 b16c1e4cf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 6 17:07:47 2020 -0400

    Merge branch 'maint-0.4.2' into maint-0.4.3

 src/feature/control/btrack_orconn_cevent.c | 1 +
 1 file changed, 1 insertion(+)