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

[arma at torproject.org]

commit 626912a81a9d494d496de38c4fd46e058d9039f2
Merge: af04bd4 b97d9ab
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Mar 14 17:21:36 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug1172          |    9 +++++++++
 changes/bug2510          |    8 ++++++++
 changes/bug2511          |    6 ++++++
 changes/bug2716          |    5 +++++
 changes/hsdir_assignment |    8 ++++++++
 src/or/circuitbuild.c    |   25 +++++++++++++++++++++++++
 src/or/dirserv.c         |   41 ++++++++++++++++++++++++++++++++++-------
 src/or/dirserv.h         |   12 ++++++++++++
 src/or/dirvote.c         |    2 +-
 src/or/main.c            |    7 +++++--
 src/or/or.h              |    1 +
 src/or/rephist.c         |   14 ++++++++++++++
 src/or/rephist.h         |    1 +
 src/or/router.c          |   20 +++++---------------
 src/or/routerlist.c      |   17 ++++++++++++++++-
 15 files changed, 150 insertions(+), 26 deletions(-)