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

[nickm at torproject.org]

commit 5f53e013cd33f1f707a1b06653290e03bc2db095
Merge: 4961645254 6c1bc570cf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 19 12:49:31 2021 -0500

    Merge branch '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(-)