[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug11243_squashed'

[nickm at torproject.org]

commit d950e243328eaac40515b4b16ac328f6748c7a3f
Merge: 032e3b7 9df61d7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 13 14:32:43 2014 -0400

    Merge remote-tracking branch 'public/bug11243_squashed'

 changes/ticket11243              |    7 +
 scripts/codegen/makedesc.py      |  218 +++++++++++++
 src/or/directory.c               |    3 +
 src/or/dirserv.c                 |    4 +-
 src/or/dirvote.c                 |    4 +-
 src/or/microdesc.c               |   50 ++-
 src/or/networkstatus.c           |   16 +-
 src/or/networkstatus.h           |   17 +-
 src/or/or.h                      |    4 +-
 src/or/router.c                  |    6 +-
 src/or/routerlist.c              |  100 ++++--
 src/or/routerlist.h              |   18 +-
 src/or/routerparse.c             |   89 +++--
 src/or/routerparse.h             |   12 +-
 src/test/example_extrainfo.inc   |  192 +++++++++++
 src/test/failing_routerdescs.inc |  668 ++++++++++++++++++++++++++++++++++++++
 src/test/include.am              |    2 +
 src/test/test_dir.c              |  509 ++++++++++++++++++++++++++++-
 src/test/test_microdesc.c        |  327 ++++++++++++++++++-
 19 files changed, 2168 insertions(+), 78 deletions(-)