[tor-commits] [tor/main] Merge branch 'maint-0.4.6'

[nickm at torproject.org]

commit 45b5987115b526b1966985db77eb5783670ac536
Merge: 270398fa31 45c8d69cbb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 26 10:04:38 2021 -0400

    Merge branch 'maint-0.4.6'

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