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

[karsten at torproject.org]

commit 4f0feab5a57e9ad815308e0e0deac7ad6707c908
Merge: e8a5a5b 1dae123
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Tue Oct 23 12:26:56 2012 -0400

    Merge remote-tracking branch 'gsathya/bug_1854_v2'

 task-1854/README.txt   |    9 ++
 task-1854/pyentropy.py |  246 ------------------------------------------------
 task-1854/pylinf.py    |  187 ++++++++++++++++++++++++++++++++++++
 3 files changed, 196 insertions(+), 246 deletions(-)