commit 3ef8d4fb1998790633e3e8eda429618713bf6a34 Merge: aeb3f4609 abdc6aede Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 3 09:45:56 2019 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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