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

[nickm at torproject.org]

commit 8da6bfa5dedbbb03d12bb81974a265feb88122c1
Merge: 4d994e7a9 91c63aae8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 15 20:53:50 2018 -0500

    Merge branch 'bug24914'

 changes/bug24914    |  3 +++
 configure.ac        |  4 ++++
 src/common/crypto.c | 28 ++++++++++++++++++++++++++++
 src/common/crypto.h | 11 +++++++++++
 src/or/relay.c      | 16 +++++++++-------
 5 files changed, 55 insertions(+), 7 deletions(-)