commit 716c48c250ed74a1d83e5c1c2d95ddd395c07a7e Merge: 5b31efe17 278e65887 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 25 20:11:47 2019 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

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