[tor-commits] [tor/maint-0.4.0] Merge branch 'tor-github/pr/867' into maint-0.4.0

[asn at torproject.org]

commit 42aae0e693be6f96eef9d124867c7e0915b6ab78
Merge: 828f1829c 194b25f0c
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Apr 3 17:59:02 2019 +0300

    Merge branch 'tor-github/pr/867' into maint-0.4.0

 changes/ticket28816             |  4 ++++
 changes/ticket29897             |  3 +++
 src/core/mainloop/connection.c  | 17 +++++++++++++++++
 src/core/mainloop/connection.h  |  2 ++
 src/feature/dircache/dircache.c |  5 +----
 5 files changed, 27 insertions(+), 4 deletions(-)