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

[nickm at torproject.org]

commit 9261f612ad7ea66580bc5f95d9c9b609e125da3a
Merge: b268dca41 a52a32c85
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 6 14:17:43 2017 -0400

    Merge remote-tracking branch 'dgoulet/bug23123_032_01'

 src/or/hs_service.c  | 7 ++++---
 src/or/rendservice.c | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)