commit d5f61375470c9c9ee949e4ff03c7a4cbd51b7224 Merge: cec555f44 dc19d65c3 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 28 11:22:06 2019 -0500

Merge branch 'maint-0.4.0'

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