commit 8ca478234056e051aed0175a0d3c0b2a9f179fe6 Merge: a7cbbdbbda ef18fb56c9 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 13 14:20:39 2020 -0400

Merge branch 'maint-0.4.4' into release-0.4.4

changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 1 + 2 files changed, 5 insertions(+)