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

[dgoulet at torproject.org]

commit 2b8af39d8631c4d83f479685ca7dd8868f1eb465
Merge: 0330eeb3e3 aebd0a4080
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 18 11:39:38 2021 -0500

    Merge branch 'maint-0.4.5' into release-0.4.5

 changes/bug40298 | 3 +++
 configure.ac     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)