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

[nickm at torproject.org]

commit bd62f78ebd10f975522e6a36fcef3f4f6c488440
Merge: 4663bec 935cd77
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 18 10:06:19 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22252      |  3 +++
 src/or/circuitstats.c | 11 ++++++++++-
 src/or/circuitstats.h |  3 +++
 src/or/config.c       |  2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)