commit 078194ecafebfff2f6aa37868539ccee15ebe73c Merge: 7915b651d9 47f1d19f8e Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 17 13:56:40 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.3

changes/ticket40125 | 4 ++++ src/test/test_rendcache.c | 2 ++ 2 files changed, 6 insertions(+)