commit 5e16c3f5fabbf9d2595157b1e7788a0e942a6e5e Merge: b6164e1 4ff5344 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 10 09:27:45 2016 -0500

Merge remote-tracking branch 'dgoulet/bug20567_030_01'

src/or/hs_common.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)