commit 7b8526d64c64f71b4d9a58dc3c48cd694b91079e Merge: 7efdf5c 971eba0 Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 17 15:27:41 2015 -0400

Merge remote-tracking branch 'yawning/feature16535'

src/ext/ed25519/donna/ed25519-donna-portable.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)