]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test
authorNick Mathewson <nickm@torproject.org>
Mon, 16 Mar 2020 14:40:55 +0000 (10:40 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 16 Mar 2020 14:40:55 +0000 (10:40 -0400)
1  2 
src/feature/dirauth/process_descs.c

Simple merge