commit 65e6e68981d9910c5f78f2cfed6c59cbee1494c7 Merge: 7fc91dc 50f527a Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 16 13:56:10 2013 -0500

Merge branch 'bug7972'

changes/bug7972 | 5 +++++ configure.ac | 7 +++++++ src/common/crypto_curve25519.c | 4 ++++ src/or/include.am | 2 +- src/test/include.am | 6 +++--- src/tools/include.am | 4 ++-- 6 files changed, 22 insertions(+), 6 deletions(-)