commit b5e2b3844ab3a1c9fe42d0c83e3e95705dee2900 Merge: 0f80dd2 fdfc528 Author: Nick Mathewson nickm@torproject.org Date: Wed May 25 09:27:35 2016 -0400

cMerge branch 'maint-0.2.8' into release-0.2.8

changes/memarea_overflow | 7 +++++++ changes/rsa_init_bug | 7 +++++++ src/common/crypto.c | 4 +++- src/common/memarea.c | 8 +++++--- 4 files changed, 22 insertions(+), 4 deletions(-)