commit e6965f78b80e2b83367df05e204c97f5c0929a3c Merge: 8936c50 6b37512 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 7 08:54:54 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.6

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