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

[dgoulet at torproject.org]

commit ee0fb69feef1becb836ffef86d2bc4dac4a89dbb
Merge: 5d99985e4 087b466fc
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue May 19 15:17:08 2020 -0400

    Merge branch 'tor-github/pr/1897'

 src/feature/rend/rendservice.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)