[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.5' into release-0.4.5

[dgoulet at torproject.org]

commit 497ff1e193a0ddfc36ee86edb6c90354e6eec43d
Merge: 397fc7a168 08c0ef61d8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 21 13:40:46 2021 -0500

    Merge branch 'maint-0.4.5' into release-0.4.5

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