commit efeb101b968fe6604ff97604afe527a36b94cfc9 Merge: 36b4fc743 cc87acf29 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 25 20:25:34 2019 -0400

Merge remote-tracking branch 'tor-github/pr/889'

changes/bug24490 | 5 +++++ src/feature/control/fmt_serverstatus.c | 7 +------ src/feature/dirauth/voteflags.c | 18 ++++++++++++++++++ src/feature/dirauth/voteflags.h | 2 ++ src/feature/nodelist/networkstatus.c | 12 ++++++------ 5 files changed, 32 insertions(+), 12 deletions(-)