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

[nickm at torproject.org]

commit 9e0587f806268c0ab96a73238c0409e95b0fbed6
Merge: a8f4f5742 5dea4b565
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 20 08:36:11 2017 -0400

    Merge remote-tracking branch 'dgoulet/ticket23305_032_01'

 src/common/crypto.h | 3 +++
 src/or/hs_common.c  | 2 +-
 src/or/or.h         | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)