commit 7803b19c43b02596c3393667ab1cba9571347823 Merge: 030d3d52f 855982728 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 09:53:39 2017 -0500

Merge remote-tracking branch 'ffmancera/github/bug23459'

changes/ticket23459 | 4 ++++ src/or/hs_circuitmap.c | 36 ++++++++++++++++++++++++++++++------ src/or/hs_circuitmap.h | 2 ++ src/or/hs_client.c | 3 ++- 4 files changed, 38 insertions(+), 7 deletions(-)