[or-cvs] [tor/release-0.2.2] Merge branch 'bug2331' into maint-0.2.2

[arma at torproject.org]

commit 1e37d8678a7f0a066886a74b0b57bce121d370b1
Merge: 597433b f475605
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 12 12:42:40 2011 -0500

    Merge branch 'bug2331' into maint-0.2.2

 changes/bug2331     |    7 +++++++
 src/common/crypto.c |   10 ++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)