commit fe3d8ec38e3c4c2a992280c2847cdd8e05f81d36 Merge: 089e57d22 f958b537a Author: Nick Mathewson <nickm@torproject.org> Date: Tue Mar 17 15:21:48 2020 -0400 Merge branch 'trove_2020_002_035' into maint-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(-)