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

[arma at torproject.org]

commit caa44c9c763d2af41e2627d5c94aa1d31d63f552
Merge: 4747c84 3f7f96d
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Apr 20 19:58:30 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug2704_part1 |    5 +++++
 changes/bug2704_part2 |    5 +++++
 changes/bug2750       |    6 ++++++
 changes/bug2948       |    7 +++++++
 src/common/address.c  |    2 +-
 src/or/rephist.c      |   21 +++++++++++++++++----
 src/or/routerparse.c  |   10 ++++++----
 src/test/test_addr.c  |    4 ++--
 8 files changed, 49 insertions(+), 11 deletions(-)