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

[arma at torproject.org]

commit 16bfb4d6c74e2077e5bdca7156ef281b61ed050d
Merge: e3b8457 b8ffb00
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri May 20 03:03:01 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug3252     |    4 ++++
 src/or/config.c     |    2 +-
 src/or/connection.c |    2 +-
 src/or/dns.c        |    9 ++++++---
 src/or/main.c       |    2 +-
 src/or/router.c     |   21 ++++++++++++++-------
 src/or/router.h     |    2 +-
 7 files changed, 28 insertions(+), 14 deletions(-)