commit 9203b3e4ed21cb6980c1e8051fbd43f1bfc81fe1 Merge: 2393e67 6b37512 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 7 08:56:39 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

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