[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

commit b74ce86830ca742f994e348c4bb4aed40ac81662 Merge: 1dbb5aa 71aacbe Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 14 12:23:00 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

changes/bug19406 | 4 ++ src/common/crypto.c | 182 ++++++++++++++++++++++++++++++++++++++--------- src/common/tortls.c | 6 ++ src/test/test_tortls.c | 6 +- src/tools/tor-checkkey.c | 11 ++- src/tools/tor-gencert.c | 22 ++++++ 6 files changed, 195 insertions(+), 36 deletions(-)