commit 1049cec5ea62758c053e59a7be27ff4681bd83c2 Merge: 780fbbdf6 57c4af16f Author: Nick Mathewson <nickm@torproject.org> Date: Fri Oct 18 12:27:49 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 changes/ticket31091 | 3 +++ src/feature/client/transports.c | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-)