commit 1128eec8368780db19666561bd3e9f2bbde88c11 Merge: 9152692b9 3af943dcd Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 7 08:57:00 2019 -0500

Merge branch 'maint-0.4.0' into release-0.4.0

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