Merge remote-tracking branch 'public/feature11791'

diff --cc src/common/torgzip.c
Simple merge

diff --cc src/common/torgzip.h
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/directory.c
Simple merge

diff --cc src/or/dirserv.c
Simple merge

diff --cc src/or/or.h
Simple merge

diff --cc src/or/relay.c
Simple merge

diff --cc src/or/relay.h
Simple merge

diff --cc src/test/test_buffers.c
Simple merge

diff --cc src/test/test_util.c
Simple merge