]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket32672_042_squashed_w_test' into maint-0.4.3
authorNick Mathewson <nickm@torproject.org>
Mon, 16 Mar 2020 16:21:49 +0000 (12:21 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 16 Mar 2020 16:21:49 +0000 (12:21 -0400)
1  2 
src/feature/dirauth/process_descs.c
src/test/test_process_descs.c

Simple merge
Simple merge