[tor-commits] [tor/master] Merge branch 'maint-0.3.0'

[nickm at torproject.org]

commit b214c2c0955373bdf0eab6954c19dd9b559200cf
Merge: e04da28 935cd77
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 18 10:06:27 2017 -0400

    Merge branch 'maint-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(-)