commit c2844d5377dcfddbac45d22376548ccae61cbc7c Merge: b387dd364 89c0a00a9 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 27 11:27:07 2017 -0400

Merge branch 'bug22895_027'

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