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

[nickm at torproject.org]

commit 9ba690e33fd31aef6a2fb6cc5971d1191373f55d
Merge: 47176eb67 abdc6aede
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 3 09:45:56 2019 -0500

    Merge branch 'maint-0.3.5'

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