commit 830b0f8c6290cf222527c0956ba6d7fe95688b83 Merge: 6edb648aa0 88559aca2d Author: George Kadianakis desnacked@riseup.net Date: Wed Feb 24 12:35:55 2021 +0200

Merge remote-tracking branch 'tor-gitlab/mr/306'

changes/ticket40255 | 5 +++++ src/feature/dirauth/dirvote.c | 10 +++++++--- src/feature/dirparse/ns_parse.c | 2 ++ src/feature/nodelist/fmt_routerstatus.c | 3 ++- src/feature/nodelist/routerstatus_st.h | 1 + 5 files changed, 17 insertions(+), 4 deletions(-)