commit 3778b97cabbf6f89694884c5f6b42dccb488df7f Merge: 065e467e7 49d6990ca Author: George Kadianakis desnacked@riseup.net Date: Thu Oct 3 19:13:02 2019 +0300

Merge branch 'tor-github/pr/1276'

changes/ticket31549 | 4 +++ src/feature/dirauth/process_descs.c | 59 +++++++++++++++++++++++--------- src/feature/dirauth/process_descs.h | 2 ++ src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_process_descs.c | 67 +++++++++++++++++++++++++++++++++++++ 7 files changed, 119 insertions(+), 16 deletions(-)