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

[nickm at torproject.org]

commit 01ac961ca1fc46efeec141ea275c6ea9971c3ee7
Merge: 21b5d76 f742b33
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 13 12:42:29 2012 -0500

    Merge branch 'fallback_dirsource_v3'

 changes/fallback_dirsource |   13 ++
 changes/rename_dirserver   |    3 +
 doc/tor.1.txt              |   29 +++--
 src/or/config.c            |  231 +++++++++++++++++++++++-------
 src/or/directory.c         |   30 ++--
 src/or/dirserv.c           |    7 +-
 src/or/dirvote.c           |    6 +-
 src/or/networkstatus.c     |   36 +----
 src/or/nodelist.c          |    7 +-
 src/or/or.h                |   25 +++-
 src/or/router.c            |    7 +-
 src/or/routerlist.c        |  342 ++++++++++++++++++++++++++++++++------------
 src/or/routerlist.h        |   28 +++--
 13 files changed, 537 insertions(+), 227 deletions(-)