[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

[nickm at torproject.org]

commit cd52e139469bad103cd6ad02cbdf3c58bfd77b26
Merge: 18a4f535d ec2a2a6b7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 12 14:22:08 2019 -0400

    Merge branch 'maint-0.4.0'

 changes/bug28525 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)