[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 26456d33546b674d5fa4d2c0112eeec561da7279
Merge: 26c022e 0130e7c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 27 22:14:54 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'

 changes/bug2475     |    5 +++++
 src/common/crypto.c |    2 +-
 src/common/torint.h |    4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)