commit 9bfe4ed6dd666bb276e35b6e5c8c3de0c218bce0 Merge: 6efc2a0e1 805f75182 Author: George Kadianakis desnacked@riseup.net Date: Thu Feb 14 17:39:34 2019 +0200

Merge branch 'tor-github/pr/536' into maint-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(-)