[tor-commits] [tor/master] Merge branch 'bug2454_025_squashed'
nickm at torproject.org
nickm at torproject.org
Tue Apr 8 19:39:06 UTC 2014
commit 689863d0a9432250f2c9a67e3e7ba2c4e5dae4c6
Merge: b933fdc 2d5a7b1
Author: Nick Mathewson <nickm at torproject.org>
Date: Tue Apr 8 15:37:15 2014 -0400
Merge branch 'bug2454_025_squashed'
changes/bug2454 | 6 ++++++
src/or/circuitstats.c | 12 +++++++++++-
src/or/main.c | 13 ++++++++++++-
src/or/main.h | 1 +
4 files changed, 30 insertions(+), 2 deletions(-)
More information about the tor-commits
mailing list