[tor-commits] [bridgedb/master] Merge branch 'dump-rebased'

[karsten at torproject.org]

commit 128063053f21ddde0f8c3dbc61a4890bef06618e
Merge: daa394e 4d00328
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Sun Mar 13 11:35:55 2011 +0100

    Merge branch 'dump-rebased'

 bridgedb.conf           |    3 +++
 lib/bridgedb/Bridges.py |   43 ++++++++++++++++++++++++++++++++++++++++++-
 lib/bridgedb/Dist.py    |    6 ++++++
 lib/bridgedb/Main.py    |   18 ++++++++++++++++--
 4 files changed, 67 insertions(+), 3 deletions(-)