commit 984ea10c316d1ce4dbd38339f3157a4f9e5c1190 Merge: f523014 bd50039 Author: Isis Lovecruft isis@torproject.org Date: Mon Mar 17 01:48:32 2014 +0000

Merge branch 'fix/11219-httpconnpool' into develop

lib/bridgedb/txrecaptcha.py | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-)