commit a3f2bc8f13eaa0868192b80186710c0765f26c59 Merge: 2c4a2a93d3 f3da5f88d7 Author: David Goulet dgoulet@torproject.org Date: Thu Jan 28 12:36:42 2021 -0500

Merge branch 'maint-0.4.3' into maint-0.4.4

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