[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

commit d21fa48cac0f41bd52306e269796559f75855323 Merge: 5dd926caa efd765a94 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 11 18:53:24 2019 -0500

Merge branch '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(-)