commit b6c8530fc3f5023920b5ca1c77e58785a46441e9 Merge: 2778032 82dee76 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 5 09:36:31 2017 -0400

Merge remote-tracking branch 'dgoulet/ticket22726_032_02'

src/or/hs_descriptor.c | 27 +++++++++------------------ src/or/hs_descriptor.h | 3 --- 2 files changed, 9 insertions(+), 21 deletions(-)