[tor-commits] [tor/master] Merge branch 'ticket21842_squashed'

[nickm at torproject.org]

commit f0fa7dcdf048b418640d2e624e5b111ed1956214
Merge: 506b4bf 7b60f01
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 7 13:21:15 2017 -0400

    Merge branch 'ticket21842_squashed'

 changes/ticket21842      |  6 ++++
 src/common/crypto.c      |  2 +-
 src/tools/include.am     | 11 ------
 src/tools/tor-checkkey.c | 89 ------------------------------------------------
 4 files changed, 7 insertions(+), 101 deletions(-)