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

[arma at torproject.org]

commit 920d475179d9ebceee884b51c7874b23047bcd5e
Merge: c79db17 b0695c1
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Sep 9 13:15:19 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug2649a         |    5 +++
 changes/bug2649b         |    5 +++
 changes/bug3894          |    4 ++
 changes/bug3909          |    3 ++
 changes/replay-firstpart |   13 +++++++
 configure.in             |    8 ++++-
 doc/tor.1.txt            |    7 +++-
 src/common/torgzip.c     |    3 +-
 src/common/util.c        |    8 +++--
 src/or/circuitbuild.c    |   17 +++++----
 src/or/config.c          |    3 +-
 src/or/control.c         |    4 +-
 src/or/dirserv.c         |   16 ++++++---
 src/or/dirvote.h         |    2 +-
 src/or/networkstatus.c   |    2 +-
 src/or/or.h              |    3 ++
 src/or/relay.c           |    2 +-
 src/or/rendservice.c     |   26 +++++++++++++--
 src/or/rephist.c         |    4 +-
 src/or/routerlist.c      |   10 +++---
 src/or/routerparse.c     |   82 +++++++++++++++++++++++-----------------------
 src/test/test.c          |    4 +-
 22 files changed, 153 insertions(+), 78 deletions(-)