commit 40f0db75bd3617bc5c4fb76aa62adcf21cea9697 Merge: 884cad3edf b404f085ad Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 7 08:38:30 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.3

changes/ticket40003 | 3 +++ src/feature/rend/rendservice.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+)