[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6

[nickm at torproject.org]

commit 8edd19ca728523bf6b4b4d0ef6e507eef740b604
Merge: 3abb9180cb 45c8d69cbb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 26 10:04:38 2021 -0400

    Merge branch 'maint-0.4.6' into release-0.4.6

 changes/ticket40419         |  3 +++
 src/test/test_address_set.c | 13 +++++++++++++
 2 files changed, 16 insertions(+)