Merge branch 'tor-github/pr/1276'
commit3778b97cabbf6f89694884c5f6b42dccb488df7f
authorGeorge Kadianakis <desnacked@riseup.net>
Thu, 3 Oct 2019 16:13:02 +0000 (3 19:13 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Thu, 3 Oct 2019 16:13:02 +0000 (3 19:13 +0300)
tree81d95d8971363af46c083bf2ab787d90b973c297
parent065e467e7cc78f25469f467d741c2d379fbbc246
parent49d6990cae0f6e7e636e320d0efcaec31b3c0453
Merge branch 'tor-github/pr/1276'
src/feature/dirauth/process_descs.c
src/feature/dirauth/process_descs.h
src/test/include.am
src/test/test.c
src/test/test.h