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

[teor at torproject.org]

commit 530304dd773b178c7cc0c5db26e53ec196219191
Merge: eaa84234c e8d84b18a
Author: teor <teor at torproject.org>
Date:   Thu Mar 14 06:36:47 2019 +1000

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

 changes/bug25733      |  4 ++++
 src/or/circuitstats.c | 20 ++++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)