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

[nickm at torproject.org]

commit 6c1bc570cf49c8e493d3278fefaf0c77e289f82c
Merge: f79a31f6d5 4c82c2d1d4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 19 12:49:31 2021 -0500

    Merge branch 'maint-0.4.4' into maint-0.4.5

 changes/40241_v2                |  4 ++++
 src/core/or/channeltls.c        |  4 +---
 src/core/or/circuitlist.c       |  4 +---
 src/feature/client/entrynodes.c |  4 +---
 src/feature/rend/rendclient.c   |  4 +---
 src/lib/log/util_bug.h          | 11 +++++++++++
 6 files changed, 19 insertions(+), 12 deletions(-)