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

[nickm at torproject.org]

commit e6ef22ca153bd0b49536ad598907f8acb4f2b705
Merge: 2fc077e676 cd75eac743
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 19 11:30:00 2021 -0400

    Merge branch 'maint-0.4.5' into release-0.4.5

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