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

[nickm at torproject.org]

commit c000763f1eadb01bdb1fc159e698ebcff58b3b8b
Merge: ff27b7ce6 ddc3eb20b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 24 09:40:00 2018 -0400

    Merge branch 'bug26116_033' into maint-0.3.3

 changes/bug26116        | 7 +++++++
 src/common/crypto_rsa.c | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)