[tor-commits] [tor/release-0.2.4] Merge branch 'bug10402_redux_024' into maint-0.2.4

[arma at torproject.org]

commit dabdc339fe5abc5949f087621996672c122101b6
Merge: 561d988 7b87003
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 18 21:55:06 2013 -0500

    Merge branch 'bug10402_redux_024' into maint-0.2.4

 changes/bug10402    |   11 +++++++++++
 src/common/crypto.c |   13 ++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)