[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/710' into maint-0.3.5

[teor at torproject.org]

commit 742b5b32d502712c7ad6d75adbf25fca6986c898
Merge: cb084de5e 78220aae1
Author: teor <teor at torproject.org>
Date:   Fri Apr 19 11:52:48 2019 +1000

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

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