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

[dgoulet at torproject.org]

commit 23451ef2fee7cecb3e08757807c90a27b9cfffc1
Merge: 2b97c1dd34 f2647295c0
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jun 29 10:41:36 2021 -0400

    Merge branch '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(+)