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

[nickm at torproject.org]

commit 5f2a1a7b4f20be121cd30def95cf7789924ca70a
Merge: e0d5a6e 7f654a6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 13 10:43:41 2011 -0400

    Merge branch 'feature3076_squashed' into maint-0.2.2

 changes/feature3076  |   14 +++++++
 doc/tor.1.txt        |   47 ++++++++++++++++-------
 src/common/address.c |   30 ++++++++++++++
 src/common/address.h |    1 +
 src/or/config.c      |   61 ++++++++++++++---------------
 src/or/connection.c  |   67 ++++++++++++++++++++++++--------
 src/or/control.c     |  105 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/or/control.h     |    2 +
 src/or/dirserv.c     |    6 +-
 src/or/main.c        |    6 ++-
 src/or/or.h          |    9 ++++
 src/or/router.c      |   38 ++++++++++++++++--
 src/or/router.h      |    3 +
 13 files changed, 319 insertions(+), 70 deletions(-)