[tor-commits] [tor/master] Merge branch 'microdesc-use-v2-squashed'

[nickm at torproject.org]

commit ad35b8f40d8701294b3b97faec3134ac1b8bb302
Merge: 08e6bd0 85ddc76
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 5 21:01:03 2011 -0400

    Merge branch 'microdesc-use-v2-squashed'

 changes/microdesc_use  |   10 +++
 src/or/circuitbuild.c  |    2 +-
 src/or/config.c        |  114 +++++++++++++++++++++-----------------
 src/or/control.c       |    2 +-
 src/or/directory.c     |   57 ++++++++++---------
 src/or/directory.h     |    3 +-
 src/or/dirserv.c       |   12 ++--
 src/or/dirvote.c       |   10 ++--
 src/or/main.c          |    9 +--
 src/or/microdesc.c     |   59 ++++++++++++++++++-
 src/or/microdesc.h     |    5 ++
 src/or/networkstatus.c |   26 +++++----
 src/or/or.h            |   53 +++++++++++-------
 src/or/router.c        |   29 +++++-----
 src/or/routerlist.c    |  146 ++++++++++++++++++++++++++---------------------
 src/or/routerlist.h    |   14 ++--
 src/or/routerparse.c   |    9 +++
 17 files changed, 337 insertions(+), 223 deletions(-)