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

[teor at torproject.org]

commit ecbc2e80a0fec4f9cd6a8c1e2dd1bebc3899567a
Merge: 4d9eb4dd0 7ce8d5513
Author: teor <teor at torproject.org>
Date:   Fri Mar 1 14:14:26 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9

 changes/bug25116    | 4 ++++
 src/or/circuituse.c | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)