commit fdfc528f85c11a1d29b6a67e32180278d1ca7cbb Merge: 6abceca c4c4380 Author: Nick Mathewson nickm@torproject.org Date: Wed May 25 09:26:45 2016 -0400

Merge branch 'bug19152_024_v2' into maint-0.2.8

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