[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/243' into maint-0.4.5

[dgoulet at torproject.org]

commit d45354d5eabe064cd3a195dc439d1ae90b6732aa
Merge: 5a2d01ae57 d89974c5c6
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Dec 17 08:25:18 2020 -0500

    Merge branch 'tor-gitlab/mr/243' into maint-0.4.5

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