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

[nickm at torproject.org]

commit 47176eb6786bcde95505f44eef7a7c9cf67658b2
Merge: 27853938a 98736cf36
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 3 09:44:15 2019 -0500

    Merge branch 'maint-0.3.5'

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