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

[nickm at torproject.org]

commit 2722296b95798fa1ef38ac6de264c00581bbf265
Merge: 69921a6a8 278e65887
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 25 20:11:47 2019 -0400

    Merge branch 'maint-0.4.1'

 src/test/test_status.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)