commit d616214e474084fd6fc0af122f699e9dd2ad02d1 Merge: 800b823c2 f73c8bd78 Author: teor teor@torproject.org Date: Fri Oct 18 12:05:20 2019 +1000

Merge branch 'maint-0.4.2'

changes/ticket32063 | 3 +++ src/feature/hs/hs_cell.c | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-)