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

[arma at torproject.org]

commit d188563f72c44ae73b3a62176197dd5a59f7efd0
Merge: db3cd62 07c5026
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue May 17 20:53:00 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug2752       |    5 +++++
 changes/bug3198       |    4 ++++
 changes/bug3207       |    4 ++++
 changes/bug3213       |    4 ++++
 src/or/circuitbuild.c |    2 +-
 src/or/config.c       |    8 ++++----
 src/or/connection.c   |   13 +++++++++++--
 src/or/main.c         |    5 +++--
 src/or/routerparse.c  |    5 +++++
 9 files changed, 41 insertions(+), 9 deletions(-)