commit 3687526c668adc7a7d2d19db66d65b3978b6b97d Merge: 7a78282 b76b9d7 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Feb 25 13:46:34 2016 -0500 Merge remote-tracking branch 'teor/bug18384' changes/bug18384 | 5 +++++ src/ext/ed25519/donna/ed25519_tor.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-)