[or-cvs] [tor/master] Merge remote branch 'public/bug2378' into maint-0.2.2

[nickm at torproject.org]

commit 2fa9ddb9580fc0d69967c54f16825f14658fd9b9
Merge: e6da9a9 e80bdfb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 3 13:54:28 2011 -0500

    Merge remote branch 'public/bug2378' into maint-0.2.2

 changes/bug2378     |    8 ++++++++
 src/common/crypto.c |   19 +++++++------------
 src/common/crypto.h |    1 -
 src/common/tortls.c |    1 +
 src/or/onion.c      |    4 ++++
 5 files changed, 20 insertions(+), 13 deletions(-)