commit a3ec811c2ee801bf6dd3d7f65c4997470e807c9d Merge: 0ef3662 fdfc528 Author: Nick Mathewson nickm@torproject.org Date: Wed May 25 09:27:47 2016 -0400

Merge branch 'maint-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(-)