[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1

[nickm at torproject.org]

commit 2d61a83513d4537735843f50c1766c224dd86183
Merge: ba7043921 6e99286d4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 10 09:22:14 2018 -0400

    Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1

 changes/bug26069       | 5 +++++
 src/or/hs_descriptor.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)