[tor-commits] [tor/master] Merge remote-tracking branch 'andrea/ticket15358_squashed_2'

commit 2308f917f99384640c5b0d1ddc9f2a3dffc68e5a Merge: 0d3b3a4 79f7721 Author: Nick Mathewson nickm@torproject.org Date: Mon May 18 14:44:28 2015 -0400

Merge remote-tracking branch 'andrea/ticket15358_squashed_2'

changes/ticket15358 | 3 +++ src/or/circuitstats.c | 6 +++++ src/or/control.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ src/or/control.h | 4 ++- 4 files changed, 82 insertions(+), 1 deletion(-)