commit 57d33b5786019b3320a7b2d5c747ce31ea3e1a77 Merge: 7fbfdf2af df8ad6473 Author: George Kadianakis desnacked@riseup.net Date: Tue Feb 26 12:35:14 2019 +0200

Merge branch 'tor-github/pr/698'

changes/bug24338 | 4 ++++ src/feature/dirauth/voteflags.c | 18 +++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-)