commit 5fe18bcf5459d8801fdeaf01e74571cd36ba47da Merge: 573bd1f 78fad38 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Aug 17 14:16:20 2015 -0400 Merge remote-tracking branch 'yawning/feature16533' changes/feature16533 | 4 + src/common/crypto.c | 11 +- src/common/crypto.h | 1 + src/common/crypto_ed25519.c | 112 +++++++++++--------- src/ext/ed25519/donna/ed25519-randombytes-custom.h | 2 +- 5 files changed, 80 insertions(+), 50 deletions(-)