commit 2d5b21598ea04b3beb59cb678d8b438b27c45ee1 Merge: 7a82fbfdab fa8ecf8820 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 19 12:44:59 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/259' into maint-0.3.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(-)