[tor-commits] [tor/master] Merge branch 'ticket28851_035_squashed' into maint-0.3.5

[nickm at torproject.org]

commit abdc6aede2187e3b77ccf2d9a91c9443dab2109e
Merge: 98736cf36 b82717b27
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 3 09:45:53 2019 -0500

    Merge branch 'ticket28851_035_squashed' into maint-0.3.5

 changes/ticket28851                   | 4 ++++
 src/lib/crypt_ops/crypto_dh_openssl.c | 6 ++++++
 2 files changed, 10 insertions(+)