[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3

[nickm at torproject.org]

commit 46002aa69114d84ea244558baeef5d07f389d9fc
Merge: 4c6a407b9 35e790211
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 7 13:33:12 2018 -0400

    Merge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3

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