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

[nickm at torproject.org]

commit de33be6e32ad9d7eef40de826b8083905293fd96
Merge: 7080e748e5 d162b98548
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 19 11:30:00 2021 -0400

    Merge branch 'maint-0.4.6'

 changes/ticket40369        | 4 ++++
 scripts/build/combine_libs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)