[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.0

[teor at torproject.org]

commit ed6f2f61a260a08d9e8f315e4397335fa39383be
Merge: 329aa1c48 389b37246
Author: teor <teor at torproject.org>
Date:   Mon Nov 25 12:35:58 2019 +1000

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

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