[tor-commits] [metrics-tasks/master] Merge remote-tracking branch 'asn/bug6232'

[karsten at torproject.org]

commit be16bde71a5b2e1e054bcf2e31cb2778be424541
Merge: 40eab19 e54b427
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Tue Jul 17 15:24:17 2012 +0200

    Merge remote-tracking branch 'asn/bug6232'

 task-6232/plot-entropy.R |    2 +-
 task-6232/pyentropy.py   |   17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)