commit dc19d65c3bd02e4b406388939a9f57bac8010c2c Merge: aef6e6134 aa360b255 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 28 11:20:26 2019 -0500

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

changes/bug29562 | 4 ++++ src/feature/client/transports.c | 29 ++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-)