commit 115cefdeeefd99f435948bfe42b1ce842019edfb Merge: eb72365 e6965f7 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 7 08:55:07 2017 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

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