commit bab5d960e0dc0f1565e17d3069947755213c4d10 Merge: 1a8fb99 0e875a1 Author: Isis Lovecruft <isis@torproject.org> Date: Fri Feb 21 20:20:49 2014 +0000 Merge branch 'hotfix/ude-persistent' into develop lib/bridgedb/persistent.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)