commit 98e14720b5bc30a7cf9af15a1f618ddce0922ef9 Merge: 968b6c30c1 165a92e33f Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 7 08:14:46 2020 -0400

Merge remote-tracking branch 'tor-github/pr/1661/head' into maint-0.3.5

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