[tor-commits] [tor/master] Merge branch 'ticket40071_045_01_squashed' into master

[nickm at torproject.org]

commit b13f32ee97e9a10e578c6f01775a1e2449b28693
Merge: 41bea71adc 9aaac94cc3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 17 07:58:37 2020 -0500

    Merge branch 'ticket40071_045_01_squashed' into master

 changes/ticket40071                 |  7 ++++
 src/core/or/circuitlist.h           |  4 ++-
 src/feature/nodelist/routerlist.c   | 54 ++---------------------------
 src/feature/relay/relay_find_addr.c | 68 +++++++++++++++++++++++++++++++++++++
 src/feature/relay/relay_find_addr.h |  2 ++
 src/feature/relay/router.c          | 21 ++++++++++--
 6 files changed, 101 insertions(+), 55 deletions(-)