commit 9955bd55932b71551a0b7286b698fa0612d76893 Merge: 0ade64b 28489ab Author: Isis Lovecruft isis@torproject.org Date: Tue Feb 3 02:15:31 2015 +0000

Merge branch 'fix/12130-obfs4' into develop

lib/bridgedb/strings.py | 4 +++- lib/bridgedb/templates/options.html | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)