commit 7e9985b75aa69d4572aac739d44d50056ed20e82
Merge: af9dc12fa 805f75182
Author: Nick Mathewson <ni...@torproject.org>
Date: Sat Dec 1 11:24:02 2018 -0500
Merge remote-tracking branch 'tor-github/pr/536'
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(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
