commit 25e654384243ae281c843b282f83ac0bf570f6ec
Merge: 43302d0 0a6bea1
Author: Isis Lovecruft <[email protected]>
Date: Thu Mar 26 04:38:10 2015 +0000
Merge branch 'fix/12504-config-pts' into develop
bridgedb.conf | 18 +++++++
lib/bridgedb/configure.py | 14 ++++++
lib/bridgedb/email/templates.py | 2 +-
lib/bridgedb/strings.py | 90 +++++++++++++++++++++++++++++++----
lib/bridgedb/templates/options.html | 13 +++--
5 files changed, 121 insertions(+), 16 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
