[tor-commits] [tor/master] Merge branch 'bug26121-033-squashed' into maint-0.3.3

[nickm at torproject.org]

commit f15f90e2cac50154c761da94eb9fd642890f2777
Merge: fa1890e97 fe5764012
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 2 10:36:44 2018 -0700

    Merge branch 'bug26121-033-squashed' into maint-0.3.3

 changes/bug26121      |  6 ++++++
 src/or/circuitstats.c | 15 +++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)