commit e167a0e17d9211205651b07b65b0e83695bf6cf1
Merge: 31dd7de 0069d14
Author: Nick Mathewson <ni...@torproject.org>
Date: Wed Jan 18 15:11:36 2017 -0500
Merge remote-tracking branch 'dgoulet/bug21062_030_01'
changes/bug21062 | 4 ++++
src/or/circuitbuild.c | 2 +-
src/or/circuitstats.c | 22 +++++++++++-----------
src/or/circuitstats.h | 2 +-
src/or/circuituse.c | 4 ++--
src/or/config.c | 2 +-
6 files changed, 20 insertions(+), 16 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
