[tor-commits] [tor/master] Merge branch 'tor-github/pr/1234'

[asn at torproject.org]

commit 0d7f76d7ca9cf09c241e3c2b392a9d1147aa6940
Merge: 5782cee71 5794523f8
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Aug 27 11:44:13 2019 +0300

    Merge branch 'tor-github/pr/1234'

 changes/ticket21003                    |   3 +
 src/feature/control/control_events.c   |   2 +-
 src/feature/control/fmt_serverstatus.c |   2 +-
 src/feature/nodelist/describe.c        |  91 +++--
 src/feature/nodelist/describe.h        |  32 ++
 src/feature/nodelist/routerinfo.h      |   2 -
 src/test/test_nodelist.c               | 614 ++++++++++++++++++++++++++++++++-
 7 files changed, 707 insertions(+), 39 deletions(-)