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

[nickm at torproject.org]

commit b16c1e4cf61b9e383b1466eb1c034561be166939
Merge: d46f67ef0 d41f1cd3e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 6 17:07:27 2020 -0400

    Merge branch 'maint-0.4.1' into maint-0.4.2

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