[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug12207_second_draft'

[nickm at torproject.org]

commit d8705ec720b201d6b21ed064d581b819a10734f7
Merge: 8c7fbdf b74442d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 16 15:33:00 2014 +0200

    Merge remote-tracking branch 'asn/bug12207_second_draft'

 src/or/entrynodes.c           |  180 ++++++++-----
 src/or/entrynodes.h           |   16 ++
 src/or/routerlist.c           |   10 +-
 src/or/routerlist.h           |    3 +
 src/test/include.am           |    1 +
 src/test/test.c               |    2 +
 src/test/test_descriptors.txt |  304 ++++++++++++++++++++++
 src/test/test_entrynodes.c    |  574 +++++++++++++++++++++++++++++++++++++++++
 8 files changed, 1023 insertions(+), 67 deletions(-)