[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug23319_032_01'

[nickm at torproject.org]

commit f9cd870f50d770f629e370583b0e9df2f8844436
Merge: cbfc50d48 dfaa5c65f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 24 16:23:57 2017 -0400

    Merge remote-tracking branch 'dgoulet/bug23319_032_01'

 src/or/hs_descriptor.c        | 2 +-
 src/or/hs_descriptor.h        | 2 ++
 src/test/test_hs_descriptor.c | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)