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

[nickm at torproject.org]

commit 915791bc483ca3c8adb63d211afd52b3f98007a9
Merge: 1ba9b7e01 fa21ac1de
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Apr 22 20:53:04 2018 -0400

    Merge branch 'ticket25024_squashed'

 ChangeLog               |  2 +-
 Makefile.am             | 20 ++++++++++++++++++++
 changes/ticket25024     |  4 ++++
 src/common/crypto_rsa.h |  2 +-
 src/or/protover.c       |  2 +-
 5 files changed, 27 insertions(+), 3 deletions(-)