[tor-commits] [tor/master] Merge branch 'maint-0.4.2'

[nickm at torproject.org]

commit 7c5716d162f2109f246fbd369185c973dd60b22b
Merge: e2a42a1ab 57c4af16f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 18 12:27:49 2019 -0400

    Merge branch 'maint-0.4.2'

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