[tor-commits] [tor/main] Merge remote-tracking branch 'tor-gitlab/mr/497' into main

[ahf at torproject.org]

commit 95b82c4feede91e18ec24dafeb382208186a9791
Merge: 39848ca166 86819229af
Author: Alexander Færøy <ahf at torproject.org>
Date:   Wed Dec 15 12:38:30 2021 +0000

    Merge remote-tracking branch 'tor-gitlab/mr/497' into main

 changes/bug40472                 | 6 ++++++
 src/feature/dircommon/consdiff.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)