commit 618fafd5c86aa9e9cdac1d99e17d332f84603c42 Merge: 0f9054c 115cefd Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 7 08:56:44 2017 -0500

Merge branch 'maint-0.2.7' into release-0.2.7

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