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

[dgoulet at torproject.org]

commit 71767b06ae4905aa73992b19bc49f1654efe7a4e
Merge: 944bdde50 c959ea755
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Dec 10 09:42:09 2019 -0500

    Merge branch 'tor-github/pr/1583'

 src/test/test_hs_control.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)