[tor-commits] [bridgedb/master] Merge remote-tracking branch 'sysrqb/bug9264_temporary_fix'

[isis at torproject.org]

commit 9490872322b8907931010a0fc06f2763d6951878
Merge: 04af175 975380d
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Aug 9 16:17:44 2013 +0000

    Merge remote-tracking branch 'sysrqb/bug9264_temporary_fix'

 lib/bridgedb/Main.py |   37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)