[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

[nickm at torproject.org]

commit d3fc9aef93a4a5d9732df814c356183c8d5571a1
Merge: 82e1ec408 3af943dcd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 7 08:57:02 2019 -0500

    Merge branch 'maint-0.4.0'

 changes/bug29144               | 5 +++++
 src/core/mainloop/connection.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)