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

[nickm at torproject.org]

commit 12f9c91c06edf09d8acf40b08aece22b77258dbc
Merge: 50e4c98 7aa20b2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 3 11:36:21 2011 -0400

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

 changes/bug3318        |    6 +++++-
 src/common/crypto.c    |   11 +++++++++++
 src/common/crypto.h    |    1 +
 src/or/routerparse.c   |    4 ++--
 src/test/test_crypto.c |    2 ++
 5 files changed, 21 insertions(+), 3 deletions(-)