commit 2e80d38dcd9996c8d7cb78808edf91a14904e271 Merge: 261bf5f86 fe3d8ec38 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 17 15:22:35 2020 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

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