[tor-commits] [stem/master] Merge extrainfo descriptor support

[atagar at torproject.org]

commit e2974e85a6560d204b674e7179a13074a3494536
Merge: bfb3973 7d96e78
Author: Damian Johnson <atagar at torproject.org>
Date:   Sun May 13 17:12:27 2012 -0700

    Merge extrainfo descriptor support

 run_tests.py                                    |    4 +
 stem/descriptor/__init__.py                     |  158 ++++++-
 stem/descriptor/extrainfo_descriptor.py         |  684 +++++++++++++++++++++++
 stem/descriptor/server_descriptor.py            |  342 +++---------
 test/integ/connection/authentication.py         |    2 +-
 test/integ/control/base_controller.py           |    2 +-
 test/integ/descriptor/__init__.py               |   13 +-
 test/integ/descriptor/data/extrainfo_descriptor |   12 +
 test/integ/descriptor/extrainfo_descriptor.py   |  102 ++++
 test/integ/descriptor/reader.py                 |    6 +-
 test/integ/descriptor/server_descriptor.py      |   65 +--
 test/integ/util/conf.py                         |    2 +-
 test/runner.py                                  |   15 +-
 test/unit/descriptor/__init__.py                |    2 +-
 test/unit/descriptor/extrainfo_descriptor.py    |  517 +++++++++++++++++
 test/unit/descriptor/server_descriptor.py       |   14 +-
 16 files changed, 1621 insertions(+), 319 deletions(-)