commit ca8e6451f2be09415eb6ebf66f22272b13d02246 Merge: ec8d41e69 42e56f5ba Author: David Goulet dgoulet@torproject.org Date: Mon Mar 30 13:38:58 2020 -0400

Merge branch 'maint-0.4.3'

changes/bug31669 | 4 ++++ src/feature/hs/hs_descriptor.c | 14 ++++++++++++-- src/test/test_hs_descriptor.c | 26 ++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 4 deletions(-)