commit 4041ff5543084978ab3a1f765280489ddc8ef02c Merge: ffbc8a7c2 9bfe4ed6d Author: George Kadianakis desnacked@riseup.net Date: Thu Feb 14 17:40:58 2019 +0200

Merge branch 'maint-0.3.5' into release-0.3.5

changes/bug24661 | 3 ++ changes/bug28569 | 3 ++ src/feature/client/entrynodes.c | 27 ++++++---- src/feature/nodelist/microdesc.c | 10 ++-- src/feature/nodelist/networkstatus.c | 7 +-- src/feature/nodelist/networkstatus.h | 5 +- src/test/test_entrynodes.c | 98 ++++++++++++++++++++++-------------- 7 files changed, 93 insertions(+), 60 deletions(-)