commit 0ade64bf9da9fed955501d02085121f07b6db3a3 Merge: f1bdddb 66ef631 Author: Isis Lovecruft <isis@torproject.org> Date: Mon Feb 2 19:38:14 2015 +0000 Merge branch 'fix/11345-qrcodes_r2' into develop lib/bridgedb/HTTPServer.py | 9 +++- lib/bridgedb/qrcodes.py | 77 +++++++++++++++++++++++++++++++++++ lib/bridgedb/templates/bridges.html | 64 ++++++++++++++++++++++++++++- requirements.txt | 2 + 4 files changed, 150 insertions(+), 2 deletions(-) diff --cc requirements.txt index 0844c14,6448920..5e71d4a --- a/requirements.txt +++ b/requirements.txt @@@ -4,8 -4,10 +4,10 @@@ Mako==0.8. Twisted==13.2.0 https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b077... pycrypto==2.6.1 -pyOpenSSL==0.13.1 +pyOpenSSL==0.14 pygeoip==0.2.7 pygpgme==0.3 + pillow>=2.6.1 + qrcode==5.0.1 recaptcha-client==1.0.6 zope.interface==3.6.1