commit 02bd135cb188531e8a6ee95959d7fe1d7f9635a8 Merge: 1bdccc03a9 d89974c5c6 Author: David Goulet dgoulet@torproject.org Date: Thu Jan 28 12:36:35 2021 -0500

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

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