commit 898f2d7c278442d2c4fbdf0126eaa406d503d088 Merge: b64dc35 7cde094 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Feb 4 11:54:38 2013 -0500 Merge branch 'bug8153' changes/bug8153 | 3 ++ src/common/crypto_curve25519.c | 31 --------------------------- src/common/crypto_curve25519.h | 12 +++++----- src/common/crypto_format.c | 46 ++++++++++++++++++++++++++++++++++++++++ src/common/include.am | 1 + src/or/onion.c | 2 + 6 files changed, 58 insertions(+), 37 deletions(-)