[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3

[nickm at torproject.org]

commit e0d68ce84fe4536142d7f5e8987a08d9e93ac626
Merge: 6803373aa 85141a3a7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 17 15:22:36 2020 -0400

    Merge branch 'maint-0.4.2' into maint-0.4.3

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