commit 4b56df9874cb67d1a9e72626bbfc69bbd40b593b Merge: 8ff60b528 0684e6c6f Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 17 08:34:23 2017 -0500

Merge branch 'maint-0.3.2'

changes/bug20963 | 4 ++++ src/or/circuitstats.c | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-)