commit e85f5178314ef26f75a8a225391e3f680a1d33a5 Merge: 9e03ef3e6b 2d5b21598e Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 19 12:45:07 2021 -0500

Merge branch 'maint-0.3.5' into release-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(-)