[tor-commits] [tor/maint-0.4.0] Merge branch 'bug28698_035' into maint-0.4.0

[nickm at torproject.org]

commit 26873bc4edb057041e5cc130ec90f4fbc2d8beb8
Merge: 5c87add92 78220aae1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 19 11:27:18 2019 -0500

    Merge branch 'bug28698_035' into maint-0.4.0

 changes/bug28698         |  3 +++
 src/core/or/circuituse.c | 30 ++++++++++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)