commit 98736cf36a1d8250e53a0c86a0b80fdb75f0d551 Merge: ed62f0fa1 041e9235c Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jan 3 09:44:10 2019 -0500 Merge remote-tracking branch 'public/ticket28838_035' into maint-0.3.5 changes/ticket28838 | 8 ++++++++ src/lib/crypt_ops/crypto_curve25519.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)