commit 80e9ca411f8822fc7c2ca882cb0fc8d422ebedbf Merge: 9a6514c 8b6a952 Author: Nick Mathewson nickm@torproject.org Date: Sat Mar 23 18:51:15 2013 -0400

Merge remote-tracking branch 'origin/maint-0.2.4'

src/common/crypto_curve25519.c | 2 +- src/test/test_crypto.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)