commit b7bd162af70ced68d3ea9d738c8cacb5bea75a1c Merge: dbc32400d 79265a6fb Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 21 13:02:12 2018 -0400

Merge remote-tracking branch 'dgoulet/ticket27774_035_03'

changes/ticket27774 | 4 ++++ src/feature/hs/hs_circuit.c | 45 ++++++++++++++++++++++++++++++--------------- src/feature/hs/hs_client.c | 19 +++++++++++++++---- 3 files changed, 49 insertions(+), 19 deletions(-)