commit d6eae78e2928544ad634356887c7a83a2cd23eaa Merge: 51675f9 c4c4380 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 7 08:47:11 2017 -0500

Merge remote-tracking branch 'public/bug19152_024_v2' into maint-0.2.4

changes/rsa_init_bug | 7 +++++++ src/common/crypto.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-)