commit 8c873474731ad121abecfd2d90b11896cabbac94 Merge: 39918ea 6b0368c Author: Isis Lovecruft isis@torproject.org Date: Mon Nov 30 21:05:03 2015 +0000

Merge branch 'fix/14685-disable-obfs2' into develop

bridgedb.conf | 2 +- test/test_https.py | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-)