commit 51377a917e246b28f437f54f8adc9a472b91b5f4 Merge: 44a9ed7df bdaf7ebc2 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 1 12:10:07 2018 -0500

Merge branch 'bug24658-rsa_squashed'

src/common/crypto.c | 918 ++--------------------------------------------- src/common/crypto.h | 68 +--- src/common/crypto_rsa.c | 923 ++++++++++++++++++++++++++++++++++++++++++++++++ src/common/crypto_rsa.h | 104 ++++++ src/common/include.am | 2 + 5 files changed, 1064 insertions(+), 951 deletions(-)