February 2014 - tor-commits - lists.torproject.org

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 04 Feb '14

04 Feb '14

commit df3d916a7d8d36778d49973e41b9a4b82fbdd109 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 4 02:15:18 2014 +0000 Update translations for liveusb-creator --- km/km.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/km/km.po b/km/km.po index ebccaf7..df1d1e9 100644 --- a/km/km.po +++ b/km/km.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-29 14:16+0100\n" -"PO-Revision-Date: 2014-02-04 01:43+0000\n" +"PO-Revision-Date: 2014-02-04 02:11+0000\n" "Last-Translator: soksophea <sksophea(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" @@ -538,7 +538,7 @@ msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." -msgstr "ព្រមាន៖ កំណត់ត្រាចាប់ផ្ដើមឡើងវិញមេនៅលើឧបករណ៍របស់អ្នកមិនផ្គូផ្គងជាមួយ system's syslinux MBR របស់អ្នក។ បើអ្នកមានបញ្ហាជាមួយការចាប់ផ្ដើមឡើងវិញនេះ ចូរសាកល្បងដំណើរការ liveusb-creator ដោយប្រើជម្រើស --reset-mbr ។" +msgstr "ព្រមាន៖ Master Boot Record នៅលើឧបករណ៍របស់អ្នកមិនផ្គូផ្គងជាមួយ system's syslinux MBR របស់អ្នក។ បើអ្នកមានបញ្ហាជាមួយការចាប់ផ្ដើមឡើងវិញនេះ ចូរសាកល្បងដំណើរការ liveusb-creator ដោយប្រើជម្រើស --reset-mbr ។" #: ../liveusb/gui.py:392 msgid ""

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 04 Feb '14

04 Feb '14

commit 8431c7c3499211b2bbdaef17dbdb2fcef536044b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 4 01:45:20 2014 +0000 Update translations for liveusb-creator_completed --- km/km.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/km/km.po b/km/km.po index 10b1fe9..ebccaf7 100644 --- a/km/km.po +++ b/km/km.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-29 14:16+0100\n" -"PO-Revision-Date: 2014-01-31 10:40+0000\n" +"PO-Revision-Date: 2014-02-04 01:43+0000\n" "Last-Translator: soksophea <sksophea(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 04 Feb '14

04 Feb '14

commit 19a8d63133d5c89ef9ea12a247774564e021e553 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 4 01:45:18 2014 +0000 Update translations for liveusb-creator --- km/km.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/km/km.po b/km/km.po index 10b1fe9..ebccaf7 100644 --- a/km/km.po +++ b/km/km.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-29 14:16+0100\n" -"PO-Revision-Date: 2014-01-31 10:40+0000\n" +"PO-Revision-Date: 2014-02-04 01:43+0000\n" "Last-Translator: soksophea <sksophea(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n"

1 0

[bridgedb/develop] Merge branch 'master' into develop
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit 44be20d6fbb5578b00ef58ec6340ea72f8aaea86 Merge: 00228a8 3ee91c1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 4 00:29:33 2014 +0000 Merge branch 'master' into develop

1 0

[bridgedb/develop] Merge branch 'release-0.1.1'
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit 3ee91c1f50e2ec0206f19fc1a161b4596bc1fd04 Merge: 380820f 00228a8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 4 00:27:19 2014 +0000 Merge branch 'release-0.1.1' CHANGELOG | 69 +++ README | 19 +- bridgedb.conf | 139 ++++-- doc/DESCRIPTORS.md | 3 +- .../XXX-bridgedb-database-improvements.txt | 260 ++++++++++ doc/proposals/XXX-bridgedb-social-distribution.txt | 496 ++++++++++++++++++++ lib/bridgedb/Bridges.py | 4 +- lib/bridgedb/HTTPServer.py | 179 +++++-- lib/bridgedb/Main.py | 21 +- lib/bridgedb/Storage.py | 10 +- lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 44 +- lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 43 +- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 49 +- lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 46 +- lib/bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 44 +- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po | 42 +- lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po | 41 +- lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 44 +- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 42 +- lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 34 +- lib/bridgedb/i18n/kn/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 45 +- lib/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 41 +- lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 46 +- lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 46 +- lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 49 +- lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 43 +- lib/bridgedb/i18n/si_LK/LC_MESSAGES/bridgedb.po | 42 +- lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 44 +- lib/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 43 +- lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 42 +- lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 33 +- lib/bridgedb/persistent.py | 2 +- lib/bridgedb/templates/assets/custom.css | 2 +- lib/bridgedb/templates/base.html | 32 ++ setup.py | 10 +- 41 files changed, 1593 insertions(+), 838 deletions(-)

1 0

[bridgedb/develop] Merge branch 'fix/9988-rm-hashlibnew' into develop
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit 00228a8c3561fa4da0de5501259e7ed7ed7f6615 Merge: f2ecd0d 124db86 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 4 00:04:23 2014 +0000 Merge branch 'fix/9988-rm-hashlibnew' into develop lib/bridgedb/Storage.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[bridgedb/develop] Change hashlib.new() → hashlib.sha1() in bridgedb.Storage.
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit 124db8690726a1867df9f1f9fee601b7479fc6cb Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Feb 3 23:02:32 2014 +0000 Change hashlib.new() → hashlib.sha1() in bridgedb.Storage. --- lib/bridgedb/Storage.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index edcc566..fdeea23 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -262,7 +262,7 @@ class Database: cur.execute("DELETE FROM EmailedBridges WHERE when_mailed < ?", (t,)) def getEmailTime(self, addr): - addr = hashlib.new(addr).hexdigest() + addr = hashlib.sha1(addr).hexdigest() cur = self._cur cur.execute("SELECT when_mailed FROM EmailedBridges WHERE " "email = ?", (addr,)) @@ -272,7 +272,7 @@ class Database: return strToTime(v[0]) def setEmailTime(self, addr, whenMailed): - addr = hashlib.new(addr).hexdigest() + addr = hashlib.sha1(addr).hexdigest() cur = self._cur t = timeToStr(whenMailed) cur.execute("INSERT OR REPLACE INTO EmailedBridges " @@ -359,7 +359,7 @@ class Database: return True def getWarnedEmail(self, addr): - addr = hashlib.new(addr).hexdigest() + addr = hashlib.sha1(addr).hexdigest() cur = self._cur cur.execute("SELECT * FROM WarnedEmails WHERE " " email = ?", (addr,)) @@ -369,7 +369,7 @@ class Database: return True def setWarnedEmail(self, addr, warned=True, whenWarned=time.time()): - addr = hashlib.new(addr).hexdigest() + addr = hashlib.sha1(addr).hexdigest() t = timeToStr(whenWarned) cur = self._cur if warned == True:

1 0

[bridgedb/master] Change hashlib.new() → hashlib.sha1() in bridgedb.Storage.
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit 124db8690726a1867df9f1f9fee601b7479fc6cb Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Feb 3 23:02:32 2014 +0000 Change hashlib.new() → hashlib.sha1() in bridgedb.Storage. --- lib/bridgedb/Storage.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index edcc566..fdeea23 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -262,7 +262,7 @@ class Database: cur.execute("DELETE FROM EmailedBridges WHERE when_mailed < ?", (t,)) def getEmailTime(self, addr): - addr = hashlib.new(addr).hexdigest() + addr = hashlib.sha1(addr).hexdigest() cur = self._cur cur.execute("SELECT when_mailed FROM EmailedBridges WHERE " "email = ?", (addr,)) @@ -272,7 +272,7 @@ class Database: return strToTime(v[0]) def setEmailTime(self, addr, whenMailed): - addr = hashlib.new(addr).hexdigest() + addr = hashlib.sha1(addr).hexdigest() cur = self._cur t = timeToStr(whenMailed) cur.execute("INSERT OR REPLACE INTO EmailedBridges " @@ -359,7 +359,7 @@ class Database: return True def getWarnedEmail(self, addr): - addr = hashlib.new(addr).hexdigest() + addr = hashlib.sha1(addr).hexdigest() cur = self._cur cur.execute("SELECT * FROM WarnedEmails WHERE " " email = ?", (addr,)) @@ -369,7 +369,7 @@ class Database: return True def setWarnedEmail(self, addr, warned=True, whenWarned=time.time()): - addr = hashlib.new(addr).hexdigest() + addr = hashlib.sha1(addr).hexdigest() t = timeToStr(whenWarned) cur = self._cur if warned == True:

1 0

[bridgedb/master] Merge remote-tracking branch 'tpo-sysrqb/develop' into develop
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit f2ecd0d49951b4efbf69969d1d9c0403ca04e929 Merge: a619387 bf3027a Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 1 23:52:42 2014 +0000 Merge remote-tracking branch 'tpo-sysrqb/develop' into develop Conflicts: bridgedb.conf README | 19 ++++++++------- bridgedb.conf | 74 +++++++++++++++++++++++++++++++-------------------------- 2 files changed, 51 insertions(+), 42 deletions(-) diff --cc bridgedb.conf index bcde0cf,534a4fe..9bf414a --- a/bridgedb.conf +++ b/bridgedb.conf @@@ -131,11 -121,21 +126,34 @@@ SAFELOGGING = Tru LOGFILE_COUNT = 5 LOGFILE_ROTATE_SIZE = 10000000 - # Only consider routers whose purpose matches this string. - BRIDGE_PURPOSE = "bridge" ++#--------------------------- ++# Database/Parsing Options \ ++#------------------------------------------------------------------------------ ++# ++# These options change various database transaction and descriptor parsing ++# behaviours. ++#------------------------------------------------------------------------------ + - # File to which we dump bridge pool assignments for statistics. - ASSIGNMENTS_FILE = "assignments.log" ++# (boolean) If True, then collect, sort, and store all timestamps seen for all ++# bridges. This operation is extremely expensive, and should be disabled when ++# it is not necessary. ++COLLECT_TIMESTAMPS = True ++ + #------------------------------- + # General Distribution Options \ + #------------------------------------------------------------------------------ + # + # These options are not specific to a certain distributor and they may alter + # the bridge selection process in certain circumstances. + #------------------------------------------------------------------------------ + + # Filename that contains blocked bridges list. Comment out to disable. + #COUNTRY_BLOCK_FILE = "blocked-bridges" + + # A list of filenames that contain IP addresses (one per line) of proxies. + # All IP-based distributors that see an incoming connection from a proxy + # will treat them specially. + PROXY_LIST_FILES = [] # How many clusters do we group IPs in when distributing bridges based on IP? # Note that if PROXY_LIST_FILES is set (below), what we actually do here @@@ -207,6 -197,18 +215,14 @@@ HTTP_UNENCRYPTED_PORT = Non # unencrypted connections. HTTP_USE_IP_FROM_FORWARDED_HEADER = False -# How many bridges do we try to give back in an answer by the -# unencrypted HTTP distributor? -HTTP_N_BRIDGES_PER_ANSWER = 3 - + # Options related to recaptcha support. + # Enable/Disable recaptcha + RECAPTCHA_ENABLED = False + + # Recaptcha API keys + RECAPTCHA_PUB_KEY = '' + RECAPTCHA_PRIV_KEY = '' + #------------------------------- # Email Distribution Options \ #------------------------------------------------------------------------------

1 0

[bridgedb/master] Merge branch 'release-0.1.1'
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit 3ee91c1f50e2ec0206f19fc1a161b4596bc1fd04 Merge: 380820f 00228a8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 4 00:27:19 2014 +0000 Merge branch 'release-0.1.1' CHANGELOG | 69 +++ README | 19 +- bridgedb.conf | 139 ++++-- doc/DESCRIPTORS.md | 3 +- .../XXX-bridgedb-database-improvements.txt | 260 ++++++++++ doc/proposals/XXX-bridgedb-social-distribution.txt | 496 ++++++++++++++++++++ lib/bridgedb/Bridges.py | 4 +- lib/bridgedb/HTTPServer.py | 179 +++++-- lib/bridgedb/Main.py | 21 +- lib/bridgedb/Storage.py | 10 +- lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 44 +- lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 43 +- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 49 +- lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 46 +- lib/bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 44 +- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po | 42 +- lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po | 41 +- lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 44 +- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 42 +- lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 34 +- lib/bridgedb/i18n/kn/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 45 +- lib/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 41 +- lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 46 +- lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 46 +- lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 49 +- lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 43 +- lib/bridgedb/i18n/si_LK/LC_MESSAGES/bridgedb.po | 42 +- lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 44 +- lib/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 43 +- lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 42 +- lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 33 +- lib/bridgedb/persistent.py | 2 +- lib/bridgedb/templates/assets/custom.css | 2 +- lib/bridgedb/templates/base.html | 32 ++ setup.py | 10 +- 41 files changed, 1593 insertions(+), 838 deletions(-)

1 0