commit 0e4f7b56a2da9583ee4749b7477655a01265715b Merge: 40456054e 46002aa69 Author: Nick Mathewson nickm@torproject.org Date: Mon May 7 13:33:19 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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