[tor-commits] [tor/master] Merge commit 'a5704b1c624c9a808f52f3a125339f00e2b9a378' into maint-0.2.2

[nickm at torproject.org]

commit 650e2aac46ed9857eed1863cefda45c632bb21eb
Merge: ec1bc8a a5704b1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 26 13:59:49 2012 -0400

    Merge commit 'a5704b1c624c9a808f52f3a125339f00e2b9a378' into maint-0.2.2

 src/common/crypto.c    |   68 +++++++++++++++++++++++++++++++++++++++++++++
 src/common/crypto.h    |    3 ++
 src/test/test_crypto.c |   71 +++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 141 insertions(+), 1 deletions(-)