commit 1b298e1863fd1cbc4241f3ffcba2e4786c982ba3 Merge: 0ba0d738a8 a0b3e9116d Author: David Goulet dgoulet@torproject.org Date: Wed Feb 3 08:58:17 2021 -0500

Merge branch 'maint-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(+)