commit 95e5f8fe03e437f75a6b9af42b0e888f1b8b75ac Merge: a797a6967 72b978c3a Author: David Goulet dgoulet@torproject.org Date: Tue Feb 12 13:02:30 2019 -0500

Merge branch 'tor-github/pr/671'

changes/ticket28614 | 8 ++++ src/feature/nodelist/networkstatus.c | 85 ++++++++++++++++++++++-------------- 2 files changed, 61 insertions(+), 32 deletions(-)