commit a22bfe04bcb106b14e2416e39dc9f43dc82eeba0
Merge: 17eb635532 2d5b21598e
Author: Nick Mathewson <[email protected]>
Date: Tue Jan 19 12:45:07 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
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(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
