[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

[nickm at torproject.org]

commit b2536c97f941ad2e4e068c43f8ce18469c63585c
Merge: 2243fc3ad1 08c0ef61d8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 21 13:40:46 2021 -0500

    Merge branch 'maint-0.4.5'

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