commit a74f620e5281194566bf30a656ddd2f6952656c9 Merge: 40536768b 85141a3a7 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 17 15:22:36 2020 -0400

Merge branch 'maint-0.4.2' into release-0.4.2

changes/ticket33119 | 8 +++++ src/feature/dirparse/parsecommon.c | 9 ++++- src/lib/crypt_ops/crypto_rsa.c | 27 +++++++++++---- src/lib/crypt_ops/crypto_rsa.h | 5 ++- src/lib/crypt_ops/crypto_rsa_nss.c | 14 +++++++- src/lib/crypt_ops/crypto_rsa_openssl.c | 63 ++++++++++++++++++++++++++++++++-- src/test/test_crypto.c | 39 +++++++++++++++++++++ 7 files changed, 154 insertions(+), 11 deletions(-)