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

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.5' into maint-0.4.6

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