commit 1d808e8b61e4adb5356f27df1a106f57cc63c7e5 Merge: 9b2a499e12 fce99957e2 Author: David Goulet dgoulet@torproject.org Date: Tue Jun 29 10:41:36 2021 -0400

Merge branch 'maint-0.4.5' into release-0.4.5

src/lib/crypt_ops/crypto_dh_nss.c | 2 ++ src/lib/crypt_ops/crypto_rand.c | 2 ++ src/lib/crypt_ops/crypto_rsa_nss.c | 2 ++ src/lib/crypt_ops/crypto_s2k.c | 2 ++ src/lib/tls/x509_nss.c | 2 ++ 5 files changed, 10 insertions(+)