commit 603074ea18e5435e1cfe1b0171792728974bc4b0 Merge: a5b323acb e1d4e2bad Author: George Kadianakis desnacked@riseup.net Date: Tue Apr 30 19:26:30 2019 +0300

Merge branch 'maint-0.4.0' into release-0.4.0

changes/bug29930 | 4 ++++ src/feature/nodelist/networkstatus.c | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-)