commit f6ad2cf9f5571d95dc6e5c4edf3955d3504ecc25 Merge: 1b5b984 a2192c4 Author: Isis Lovecruft <isis@torproject.org> Date: Fri Feb 21 20:59:49 2014 +0000 Merge branch 'hotfix/9264-descdigest-none' into develop lib/bridgedb/Bridges.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)