commit 3d952b461dd305951a1a566eafd87874e1b2849a Merge: 71fd30b75a c38c36e5f1 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 21 13:37:21 2021 -0500

Merge remote-tracking branch 'tor-gitlab/mr/269' into maint-0.4.5

changes/bug24857 | 6 ++++++ src/feature/dircache/consdiffmgr.c | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-)