commit 8fd5e5c2cd028c29fe827dcb5f7e08c9ee43da3a Merge: 2fd3aca 5db4f96 Author: Isis Lovecruft <isis@torproject.org> Date: Fri Dec 13 04:10:26 2013 +0000 Merge branch 'fix/9013_r1' into develop lib/bridgedb/Bridges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)