commit 2197bfcc6a858af8f8ff41dba8825d676d18d37c Merge: 703254a 0116eae Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 27 13:17:42 2016 -0400

Merge branch 'maint-0.2.8'

changes/bug19499 | 4 ++++ src/common/crypto.c | 24 ++++++++++++------------ src/tools/tor-checkkey.c | 4 ++-- 3 files changed, 18 insertions(+), 14 deletions(-)