[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0

[nickm at torproject.org]

commit 35a2590f29dac06b829b07a54d3e3f3981fa9e44
Merge: a0ada65a3 dc19d65c3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 28 11:22:03 2019 -0500

    Merge branch 'maint-0.4.0' into release-0.4.0

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