commit d67770d8cfe717bfdc0540311178a3fb6e1b7ced Merge: 0156214 12311ff Author: Isis Lovecruft isis@torproject.org Date: Wed Aug 20 04:15:12 2014 +0000

Merge remote-tracking branch 'tpo-sysrqb/bug12781-dumpbuckets' into develop

lib/bridgedb/Bucket.py | 47 +++++++++++++++++++++--------- lib/bridgedb/test/test_Bucket.py | 59 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 13 deletions(-)