[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'dgoulet/ticket24425_032_01' into maint-0.3.2

[nickm at torproject.org]

commit fc33caadaebdb06d39068f4492431902c93ee8a7
Merge: 5c4da2cac 7bb269548
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 20 09:59:06 2017 -0500

    Merge remote-tracking branch 'dgoulet/ticket24425_032_01' into maint-0.3.2

 changes/ticket24425 | 4 ++++
 src/or/hs_common.h  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)