commit e78ce52aff553c71ec8092de9fea8f3078abba72 Merge: 146e4cfa95 7915b651d9 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 13 14:20:39 2020 -0400

Merge branch 'maint-0.4.3' into release-0.4.3

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