[tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5

[nickm at torproject.org]

commit 6b37512dc76152926a16d93f2be52083cd5ae436
Merge: 05ec055 d6eae78
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 08:54:47 2017 -0500

    Merge branch 'maint-0.2.4' into maint-0.2.5

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