commit 2e5724d1534f3357654c9fb9d222114bba945219 Merge: 0d82a8be7 46efc0ff3 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 11 10:21:58 2019 -0400

Merge branch 'ticket31682_042_01_squashed'

changes/ticket31682 | 3 +++ src/feature/hs/hs_cell.c | 30 +++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-)