[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm at torproject.org]

commit 0c9d6177628059f089e8792255b4b16b0caaa857
Merge: db9ca07c4 f15f90e2c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 2 10:42:06 2018 -0700

    Merge branch 'maint-0.3.3' into release-0.3.3

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