commit 80c987fbb41fb7299cf4fe8b04d6190c581bd158 Merge: 96d39fd 5b0b51c Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 20 10:34:31 2013 -0400

Merge remote-tracking branch 'origin/maint-0.2.4'

changes/bug6304 | 4 ++++ src/or/circuitstats.c | 19 ++++++++----------- src/or/config.c | 12 ++++++++---- 3 files changed, 20 insertions(+), 15 deletions(-)