commit 8f53b62ff569e11574fc5b3171e88c774821f257 Merge: 26b047d 6be3a91 Author: Isis Lovecruft isis@torproject.org Date: Wed Mar 25 04:02:07 2015 +0000

Merge branch 'hotfix/0.3.0-twisted-14.0.2_r1' into develop

.travis.requirements.txt | 1 + lib/bridgedb/parse/versions.py | 11 ++++++-- lib/bridgedb/test/test_crypto.py | 18 +++++++++++++ lib/bridgedb/txrecaptcha.py | 55 ++++++++++++++++++++++++++++++++++---- requirements.txt | 1 + 5 files changed, 79 insertions(+), 7 deletions(-)