[tor-commits] [tor/master] Merge branch 'tor-github/pr/1057'

[dgoulet at torproject.org]

commit 8dfc8d7063bf4b317bd47b7a2e8cccb0a428e861
Merge: a462ca7cc 8f3430fc2
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu May 30 12:58:35 2019 -0400

    Merge branch 'tor-github/pr/1057'

 changes/bug30629        | 6 ++++++
 src/app/main/shutdown.c | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)