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

[nickm at torproject.org]

commit b1b6552251c87db6c4fd226add8ae8bdb9327981
Merge: 57b9542 cf399f1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 16 17:16:54 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'
    
    Conflicts:
    	src/common/crypto.c

 changes/doxygen        |    6 ++++++
 src/common/crypto.c    |    1 -
 src/common/log.c       |    6 +++---
 src/test/test_crypto.c |    6 ++++--
 src/test/test_dir.c    |    6 +++---
 5 files changed, 16 insertions(+), 9 deletions(-)