]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2eb900f f078aab)
Merge branch 'maint-0.3.5' into maint-0.4.4
authorNick Mathewson <nickm@torproject.org>
Mon, 15 Mar 2021 13:01:59 +0000 (09:01 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 15 Mar 2021 13:01:59 +0000 (09:01 -0400)
1  2 
src/feature/dirauth/dirvote.c patch | diff1 | diff2 | blob | history

diff --cc src/feature/dirauth/dirvote.c
Simple merge
Mirror of https://git.torproject.org/tor.git