[tor-commits] [tor/main] Merge branch 'maint-0.4.5' into maint-0.4.6

[dgoulet at torproject.org]

commit f2647295c0629abcfc76849747da87cb12ed4d8b
Merge: 45c8d69cbb fce99957e2
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jun 29 10:41:36 2021 -0400

    Merge branch 'maint-0.4.5' into maint-0.4.6

 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(+)