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

[nickm at torproject.org]

commit 2a1ddd78da86d6a675146ae2afabfbcede437a95
Merge: 007d3d233 b71f4ecb8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 11 16:32:40 2017 -0400

    Merge remote-tracking branch 'dgoulet/bug23455_032_01'

 src/or/hs_circuitmap.c | 24 +++++++++++++++++++++---
 src/or/hs_client.c     |  8 ++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)