commit 334469cc39f329701fa48fb752d35a2cee7edc69 Merge: 25ecdf140 c34c10121 Author: teor <teor@torproject.org> Date: Mon Feb 17 13:46:09 2020 +1000 Merge branch 'bug33195_master' into ticket33280_master Conflicts: * Keep the changes from ticket33280_master changes/ticket33188 | 5 + doc/tor.1.txt | 630 ++++++++++++++++++----------------- src/feature/dirauth/process_descs.h | 6 +- src/feature/dircache/dirserv.h | 4 +- src/feature/nodelist/networkstatus.c | 2 +- src/lib/cc/compat_compiler.h | 2 +- src/test/test_util.c | 4 +- 7 files changed, 335 insertions(+), 318 deletions(-)