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

[nickm at torproject.org]

commit ab92fd5907c9d8fed647d22cb923a9175a28ba33
Merge: 6b0839215 b16c1e4cf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 6 17:18:46 2020 -0400

    Merge branch 'maint-0.4.2' into release-0.4.2

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