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

[dgoulet at torproject.org]

commit 34ac582f470532f37460f4679f4cc88840b0941d
Merge: 649ca08dd9 d45354d5ea
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Dec 17 08:25:29 2020 -0500

    Merge branch 'maint-0.4.5' into release-0.4.5

 changes/bug40210                  | 5 +++++
 src/ext/keccak-tiny/keccak-tiny.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)