]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.4.3'
authorNick Mathewson <nickm@torproject.org>
Fri, 20 Mar 2020 11:56:42 +0000 (07:56 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 20 Mar 2020 11:56:42 +0000 (07:56 -0400)
1  2 
src/feature/dirauth/dirvote.c
src/feature/dirauth/dirvote.h

Simple merge
Simple merge