commit de0babab9b0917bdee45907d3ec6f0ea74f55cbc Merge: 33e0c0310 42aae0e69 Author: George Kadianakis desnacked@riseup.net Date: Wed Apr 3 17:59:46 2019 +0300

Merge branch 'maint-0.4.0' into release-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(-)