commit 9e33391ebb01700d3f3f9cb29a6b74756559de4a Merge: 640a777c9 118c35b55 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 7 11:08:20 2020 -0400
Merge remote-tracking branch 'tor-github/pr/1974/head'
src/feature/hs/hs_service.c | 3 +++ src/feature/rend/rendservice.c | 3 +++ 2 files changed, 6 insertions(+)