commit efd765a94816bb216e81a4962c94bac385947719 Merge: 694e3c57f cec616a0c Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 11 18:53:18 2019 -0500

Merge remote-tracking branch 'tor-github/pr/563' into maint-0.3.5

changes/ticket28669 | 6 +++++ src/core/or/circuituse.c | 3 +-- src/core/or/connection_edge.c | 15 ++++++++++++ src/core/or/connection_edge.h | 3 +++ src/feature/hs/hs_client.c | 56 ++++++++++++++++++++++++++++--------------- src/feature/rend/rendclient.c | 6 ++--- 6 files changed, 64 insertions(+), 25 deletions(-)