commit ef18fb56c95c7761017eb8bb36a97415d7bb82ce Merge: 26b257757b 7915b651d9 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 13 14:20:39 2020 -0400

Merge branch 'maint-0.4.3' into maint-0.4.4

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