[tor-commits] [tor/maint-0.3.2] Merge branch 'bug20963_032' into maint-0.3.2

[nickm at torproject.org]

commit 0684e6c6f0b1d6dad12d4a7e40f163671ee44f84
Merge: 56b7407a9 ef55a7a69
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 17 08:34:05 2017 -0500

    Merge branch 'bug20963_032' into maint-0.3.2

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