[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1661'

[teor at torproject.org]

commit 5fa7c1b13fbefcfd9b71a1f95922cf4e92b5e141
Merge: d430b5a07 165a92e33
Author: teor <teor at torproject.org>
Date:   Thu Jan 16 00:46:31 2020 +1000

    Merge remote-tracking branch 'tor-github/pr/1661'

 changes/log_32868                  |  4 +++
 src/feature/nodelist/node_select.c | 54 +++++++++++++++++++++++++++++++++++---
 2 files changed, 54 insertions(+), 4 deletions(-)