commit 7b93939c773e62f2dabf73011b470d1a57d96efd Merge: fa3cad363 50fbede45 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

changes/ticket22895 | 3 +++ src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-)