commit aeb3f460975e019ac3f1896e2ecf250c52324ae2 Merge: 55474b9d9 98736cf36 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 3 09:44:15 2019 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

changes/ticket28838 | 8 ++++++++ src/lib/crypt_ops/crypto_curve25519.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)