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

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.0' into release-0.4.0

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