[tor-commits] [tor/master] Merge remote-tracking branch 'public/ticket27686_034' into maint-0.3.4

[nickm at torproject.org]

commit fe1fb4b0c3ed175eccacbc1491ccab75375173bb
Merge: 80a6228aa ab92f9342
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 15 17:01:54 2018 -0500

    Merge remote-tracking branch 'public/ticket27686_034' into maint-0.3.4

 src/or/circuitlist.c     | 21 ++++++++++++++++++---
 src/or/connection_edge.c | 23 ++++++++++++++++++++++-
 src/or/connection_edge.h |  6 +++++-
 src/or/relay.c           |  2 +-
 4 files changed, 46 insertions(+), 6 deletions(-)