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

[nickm at torproject.org]

commit 42b15a0aaa6e00c2ce0ce030abdb87e787f27fe4
Merge: 6f200b6 a5232e0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat May 28 01:55:34 2011 -0400

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

 changes/bug3208         |    6 ++++++
 src/or/circuitbuild.c   |    3 ---
 src/or/command.c        |    1 +
 src/or/control.c        |    2 --
 src/or/directory.c      |    2 --
 src/or/dirvote.c        |    3 +--
 src/or/eventdns.c       |    3 +++
 src/test/test_crypto.c  |    4 +++-
 src/tools/tor-resolve.c |    4 +---
 9 files changed, 15 insertions(+), 13 deletions(-)