commit 428d5eea11f82d3b07c33d9660c0903a86eaaddf Merge: d9f671e933 4c82c2d1d4 Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 19 12:49:30 2021 -0500

Merge branch 'maint-0.4.4' into release-0.4.4

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(-)