[tor-commits] [bridgedb/develop] Merge branch 'fix/12932-pt-args-spaces' into develop

commit 6bc04ac2f9d05080c960d4de04b566e43146425e Merge: fe3967b 519426c Author: Isis Lovecruft isis@torproject.org Date: Sat Sep 6 03:37:48 2014 +0000

Merge branch 'fix/12932-pt-args-spaces' into develop

.test.requirements.txt | 2 +- .travis.requirements.txt | 2 +- lib/bridgedb/Bridges.py | 26 ++++--- lib/bridgedb/strings.py | 1 + lib/bridgedb/templates/options.html | 1 + lib/bridgedb/test/test_https.py | 133 +++++++++++++++++++++++++++++++++++ setup.py | 2 +- 7 files changed, 155 insertions(+), 12 deletions(-)