[tor-commits] [tor/master] Merge branch 'ticket27686_035'

[nickm at torproject.org]

commit 88a93ccc7bdae432e07eac1e9b6ad4224f370b91
Merge: 50367d06f eaeb4c108
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 18 16:40:30 2018 -0400

    Merge branch 'ticket27686_035'

 src/core/or/circuitlist.c     | 20 ++++++++++++++++++--
 src/core/or/connection_edge.c | 23 ++++++++++++++++++++++-
 src/core/or/connection_edge.h |  6 ++++++
 src/core/or/relay.c           |  1 +
 4 files changed, 47 insertions(+), 3 deletions(-)