commit 57c4af16f0d9e80c0adaaada61609497723f6184 Merge: fbd2fef22 389b37246 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 18 12:27:39 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.2

changes/ticket31091 | 3 +++ src/feature/client/transports.c | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-)