commit 753d0deaf9ee1cb781be97a668a6ebbd8a0d38fb Merge: a9c48e1 fed7c16 Author: Isis Lovecruft isis@torproject.org Date: Tue Nov 19 00:07:45 2013 +0000

Merge branch 'hotfix/revert-a49ee2a' into develop

lib/bridgedb/Bridges.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)