[tor-commits] [metrics-web/master] Merge branch 'statusentry'

[karsten at torproject.org]

commit 8d8542c8f43d5f301533fb13593f3694986ee1d5
Merge: 075fd8e 87722e2
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Wed Jan 11 11:26:30 2012 +0100

    Merge branch 'statusentry'

 db/tordir.sql |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 53 insertions(+), 4 deletions(-)