Merge branch 'trove_2020_002_035' into trove_2020_002_041

author Nick Mathewson <nickm@torproject.org>

Tue, 17 Mar 2020 14:45:03 +0000 (10:45 -0400)

committer Nick Mathewson <nickm@torproject.org>

Tue, 17 Mar 2020 14:45:03 +0000 (10:45 -0400)
author Nick Mathewson <nickm@torproject.org>
Tue, 17 Mar 2020 14:45:03 +0000 (10:45 -0400)
committer Nick Mathewson <nickm@torproject.org>
Tue, 17 Mar 2020 14:45:03 +0000 (10:45 -0400)
diff --cc src/lib/crypt_ops/crypto_rsa_nss.c
Simple merge
diff --cc src/test/test_crypto.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Tue, 17 Mar 2020 14:45:03 +0000 (10:45 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Tue, 17 Mar 2020 14:45:03 +0000 (10:45 -0400)
		1	2
src/lib/crypt_ops/crypto_rsa_nss.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/test_crypto.c	patch \|	diff1 \|	diff2 \|	blob \| history