[tor-commits] [metrics-tasks/master] Merge remote-tracking branch 'gsathya/bug_1854_v2'

[karsten at torproject.org]

commit 99a21d55b607daeb79033642ffda0ce288528992
Merge: 3f7a92b 6da2e5b
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Sun Nov 25 14:04:40 2012 -0500

    Merge remote-tracking branch 'gsathya/bug_1854_v2'

 task-1854/README.txt |   17 +++---
 task-1854/pylinf.py  |  139 +++++++++++++++++++++++++++++++++++---------------
 2 files changed, 105 insertions(+), 51 deletions(-)