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

[dgoulet at torproject.org]

commit 5527aef56f0d9a443d94f51d2a7f50ddc50c61cc
Merge: 0bd4cd8101 d45354d5ea
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Dec 17 08:25:29 2020 -0500

    Merge branch 'maint-0.4.5'

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