commit d24acc008dcdc0b9515ac754ac54e00753b0f8b5 Merge: f8e38d21c c9a9de120 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 5 12:01:28 2019 -0500

Merge remote-tracking branch 'tor-github/pr/759'

changes/ticket25614 | 3 +++ src/feature/client/transports.c | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-)