commit e231d84dd571b732f70f5ddd23a9274027d84b88 Merge: 553c36d15 d0c335021 Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 12 18:26:08 2020 -0500

Merge branch 'maint-0.4.3'

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 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)