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

[nickm at torproject.org]

commit 066904e758c689533eff6b682c994551c6e574b6
Merge: 2367b1ed3 0684e6c6f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 17 08:34:08 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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