commit 6dc9930d3a14c30af0f285a884476f33a782938c Merge: efcae919a 7bf257b12 Author: teor teor@torproject.org Date: Thu Apr 30 22:22:09 2020 +1000

Merge branch 'pr1870_squashed'

changes/ticket33956 | 5 +++++ src/core/or/channeltls.c | 10 +++------- src/lib/net/address.c | 3 +-- src/lib/net/address.h | 9 +++++++++ 4 files changed, 18 insertions(+), 9 deletions(-)