[tor-commits] [tor/main] Merge remote-tracking branch 'tor-gitlab/mr/442' into main

[ahf at torproject.org]

commit d320f4d2a2b8208d4576be99e85babdd387d10c2
Merge: 998706c611 b7992d4f79
Author: Alexander Færøy <ahf at torproject.org>
Date:   Thu Oct 21 12:50:28 2021 +0000

    Merge remote-tracking branch 'tor-gitlab/mr/442' into main

 changes/bug40471                        | 4 ++++
 src/feature/dirauth/dirauth_options.inc | 3 +++
 src/feature/dirauth/dirvote.c           | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)