commit c80052f60399a4b16dbb42ad1648633e0236e8bd Merge: c18d0b378c b404f085ad Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 7 08:38:30 2020 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

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