[tor-commits] [bridgedb/master] Merge branch 'fix/11231-additional-bug-fixes' into develop

[isis at torproject.org]

commit 00eaf9160f65c16c725ed7f05ac0583b9da63dc0
Merge: 7fdde31 b4f88ad
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Mar 21 22:30:10 2014 +0000

    Merge branch 'fix/11231-additional-bug-fixes' into develop

 lib/bridgedb/HTTPServer.py  |   14 +++++++++++++-
 lib/bridgedb/txrecaptcha.py |   12 ++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)