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

[nickm at torproject.org]

commit 5b57f88f6097e92a052cd8d381587cee1dea6006
Merge: cc6fcbd 0116eae
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 27 13:20:57 2016 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

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