commit 59ec642fcc1df7b9a68b0856b1d45c672844952a Merge: b5c8cfb 0e875a1 Author: Isis Lovecruft isis@torproject.org Date: Sun Feb 9 05:31:11 2014 +0000

Merge branch 'hotfix/ude-persistent' into testing/tpo-sysrqb/bug9264_rebased_1

lib/bridgedb/persistent.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)