[tor-commits] [tor/master] Merge branch 'bug8121_squashed'

[nickm at torproject.org]

commit 0175209e6b3bf990633838e35b9c70d4099124ae
Merge: b4a68d1 266419d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 7 14:09:17 2013 -0500

    Merge branch 'bug8121_squashed'

 changes/bug8121                |    7 +++++++
 src/common/crypto_curve25519.c |   11 +++++++++--
 src/test/test_crypto.c         |   14 ++++++++++++--
 3 files changed, 28 insertions(+), 4 deletions(-)