[tor-commits] [stem/master] Merge server descriptor changes suggested by Karsten

[atagar at torproject.org]

commit ac3f6271e0896cbdb2e668576f43670b260bfa2b
Merge: 809b341 9f76969
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Apr 14 19:12:01 2012 -0700

    Merge server descriptor changes suggested by Karsten

 stem/descriptor/reader.py                       |   89 ++--
 stem/descriptor/server_descriptor.py            |  663 +++++++++++++++++------
 stem/util/connection.py                         |   40 ++-
 test/integ/descriptor/data/bridge_descriptor    |   13 +
 test/integ/descriptor/data/non-ascii_descriptor |   29 +
 test/integ/descriptor/data/old_descriptor       |   47 ++
 test/integ/descriptor/reader.py                 |   10 +-
 test/integ/descriptor/server_descriptor.py      |  164 ++++++-
 test/unit/descriptor/server_descriptor.py       |  181 ++++++-
 test/unit/util/connection.py                    |   28 +
 10 files changed, 1016 insertions(+), 248 deletions(-)