commit c9242f4fd4c0ae783946db77b9ecc6214d41bd72 Merge: d357b97 31d888c Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 14 12:32:00 2013 -0500

Merge branch 'bug7869'

src/common/crypto_curve25519.c | 30 ++++++++++++++++++++++++++++++ src/common/crypto_curve25519.h | 7 +++++++ src/or/routerparse.c | 25 ++++++++----------------- src/test/test_crypto.c | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 17 deletions(-)