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

[nickm at torproject.org]

commit 56451e8b98ac621ae45847762a3d2befe322de44
Merge: db61ae2 e6965f7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 08:56:42 2017 -0500

    Merge branch 'maint-0.2.6' into release-0.2.6

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