commit f503f06779e47a0b51a631d8195632e6c2d42986 Merge: 016044b95e a0b3e9116d Author: David Goulet dgoulet@torproject.org Date: Wed Feb 3 08:58:17 2021 -0500

Merge branch 'maint-0.4.5' into release-0.4.5

src/core/or/address_set.c | 74 ++++++++++++++++++++++++++++++++++++++++++ src/core/or/address_set.h | 15 +++++++++ src/feature/nodelist/dirlist.c | 2 ++ 3 files changed, 91 insertions(+)