[tor-commits] [tor/master] Merge branch 'tickets_5529_5534_5974_6406'

[nickm at torproject.org]

commit a4995d1507d93186bcfcdc4d3f61b8c91f7f75cc
Merge: 24451e6 fff842a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 19 17:52:21 2012 -0400

    Merge branch 'tickets_5529_5534_5974_6406'

 changes/bug5529        |    3 +
 changes/bug5534        |    4 ++
 changes/bug5974        |    4 ++
 changes/enh6406        |    4 ++
 doc/tor.1.txt          |   14 +++++++
 src/or/config.c        |    2 +
 src/or/connection_or.c |    2 +-
 src/or/dirserv.c       |   97 ++++++++++++++++++++++++++++++++++++-----------
 src/or/dirserv.h       |    2 +-
 src/or/nodelist.c      |   37 ++++++++++++++++--
 src/or/nodelist.h      |    2 +-
 src/or/or.h            |   31 +++++++++------
 src/or/router.c        |   20 ++++++++++
 src/or/router.h        |    2 +
 src/or/routerlist.c    |   20 +++++-----
 src/or/routerlist.h    |    2 +-
 16 files changed, 193 insertions(+), 53 deletions(-)