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

[nickm at torproject.org]

commit a2192a671c9038026696f079184c4358fb70d443
Merge: 040d7ce d6eae78
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 08:56:58 2017 -0500

    Merge branch 'maint-0.2.4' into release-0.2.4

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