commit 5b345c693e73ad636a3dce9ca1e8622e1df8ed26 Merge: feecf46e6d 45d9830493 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Aug 13 14:20:39 2020 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)