[tor-commits] [tor/release-0.2.1] Merge branch 'maint-0.2.1' into release-0.2.1

[arma at torproject.org]

commit 9f61d8a3b3cc0433b622d552d76bf30e052e95ea
Merge: 9ac4ceb a166f10
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Oct 26 17:13:18 2011 -0400

    Merge branch 'maint-0.2.1' into release-0.2.1

 changes/bug3208         |    4 ++++
 changes/bug3208b        |    4 ++++
 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/or/test.c           |    3 ++-
 src/tools/tor-resolve.c |    4 +---
 10 files changed, 16 insertions(+), 13 deletions(-)