[tor-commits] [tor/master] Merge remote-tracking branch 'andrea/ticket19323_squashed'

[nickm at torproject.org]

commit cb54390e0f1b1619b9e89d054ed07ccf081625cb
Merge: 9a76415 d511c67
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 30 11:44:58 2016 -0400

    Merge remote-tracking branch 'andrea/ticket19323_squashed'

 changes/ticket19323        |    3 +
 src/or/control.c           |  449 ++++++++++++++++++
 src/or/control.h           |   25 +
 src/or/entrynodes.c        |   38 ++
 src/or/entrynodes.h        |    4 +
 src/or/networkstatus.c     |   83 ++++
 src/or/networkstatus.h     |   11 +
 src/or/routerlist.c        |  106 +++++
 src/or/routerlist.h        |    8 +
 src/test/test_controller.c | 1081 ++++++++++++++++++++++++++++++++++++++++++++
 10 files changed, 1808 insertions(+)