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

[nickm at torproject.org]

commit 109cfebca540c80d176cde54e672e72ab8908139
Merge: 85688dc33 0850ae504
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 4 12:24:05 2017 -0400

    Merge remote-tracking branch 'dgoulet/bug23327_032_01'

 src/or/hs_client.c | 8 ++++++++
 src/or/hs_client.h | 2 ++
 src/or/hs_common.c | 2 ++
 3 files changed, 12 insertions(+)