August 2013 - tor-commits - lists.torproject.org

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 09 Aug '13

09 Aug '13

commit 37ddce7807fd826d8fc3dea79afb80f4bc02a6ab Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 9 19:46:13 2013 +0000 Update translations for liveusb-creator --- tr/tr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index 13c5242..91939b6 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-07 16:08+0200\n" -"PO-Revision-Date: 2013-08-09 16:30+0000\n" +"PO-Revision-Date: 2013-08-09 19:40+0000\n" "Last-Translator: Bloodia <aycaom(a)hotmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -251,7 +251,7 @@ msgstr "Cihazda boş alan yok." #: ../liveusb/gui.py:543 msgid "Partition is FAT16; Restricting overlay size to 2G" -msgstr "" +msgstr "Partisyon FAT16 formatında; Overlay boyutu 2G ile sınırlandırılıyor" #: ../liveusb/gui.py:539 msgid "Partition is FAT32; Restricting overlay size to 4G" @@ -519,7 +519,7 @@ msgstr "Uyaru: Seçili sürücüdeki tüm veriler silinecektir." #: ../liveusb/gui.py:694 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." -msgstr "" +msgstr "Uyarı: Yeni bir kalıcı overlay yaratmak mevcut olanın silinmesine neden olacaktır. " #: ../liveusb/gui.py:657 msgid ""

1 0

[bridgedb/master] Temporary fix for duplicate bridge entries
by isis＠torproject.org 09 Aug '13

09 Aug '13

commit 975380d9a959db89f07521fc6da64fadee5922d7 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Sun Aug 4 05:48:48 2013 +0000 Temporary fix for duplicate bridge entries There exists a bug (somewhere) that causes some bridges to be added multiple times. The cause is currently unknown. This should prevent bridges from being added more than once, due to the way bridges are linked between the bridge descriptors and the extra-info descriptors. Temporary Bug fix for #9264. --- lib/bridgedb/Main.py | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index f5ebc4e..fd9fbda 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -205,22 +205,27 @@ def load(cfg, splitter, clear=False): logging.debug("Parsing document for purpose=%s", cfg.BRIDGE_PURPOSE) f = open(fname, 'r') for bridge in Bridges.parseDescFile(f, cfg.BRIDGE_PURPOSE): - bridges[bridge.getID()] = bridge - s = status.get(bridge.getID()) - if s is not None: - running, stable = s - bridge.setStatus(running=running, stable=stable) - bridge.or_addresses = addresses.get(bridge.getID()) - splitter.insert(bridge) - # add or update BridgeHistory entries into the database - # XXX: what do we do with all these or_addresses? - # The bridge stability metrics are only concerned with a single ip:port - # So for now, we will only consider the bridges primary IP:port - if bridge.getID() in timestamps.keys(): - ts = timestamps[bridge.getID()][:] - ts.sort() - for timestamp in ts: - bridgedb.Stability.addOrUpdateBridgeHistory(bridge, timestamp) + if bridge.getID() in bridges: + logging.warn("Parsed bridge that we've already added. Skipping.") + logging.debug(" Bridge: %s" % bridge.getID()) + continue + else: + bridges[bridge.getID()] = bridge + s = status.get(bridge.getID()) + if s is not None: + running, stable = s + bridge.setStatus(running=running, stable=stable) + bridge.or_addresses = addresses.get(bridge.getID()) + splitter.insert(bridge) + # add or update BridgeHistory entries into the database + # XXX: what do we do with all these or_addresses? + # The bridge stability metrics are only concerned with a single ip:port + # So for now, we will only consider the bridges primary IP:port + if bridge.getID() in timestamps.keys(): + ts = timestamps[bridge.getID()][:] + ts.sort() + for timestamp in ts: + bridgedb.Stability.addOrUpdateBridgeHistory(bridge, timestamp) logging.debug("Closing descriptor document") f.close() # read pluggable transports from extra-info document

1 0

[bridgedb/master] Remove lib/ directory from .gitignore.
by isis＠torproject.org 09 Aug '13

09 Aug '13

commit de15e6faf46085c5d2b5ca4f4391fa6f59f978c8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 7 21:16:12 2013 +0000 Remove lib/ directory from .gitignore. --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index c264250..2d931b8 100644 --- a/.gitignore +++ b/.gitignore @@ -16,8 +16,6 @@ var sdist develop-eggs .installed.cfg -lib -lib64 MANIFEST # Installer logs

1 0

[bridgedb/master] Add *.egg-info directories to the .gitignore.
by isis＠torproject.org 09 Aug '13

09 Aug '13

commit 9eeeb6b3fec520f041d5a454accf04548ac97e78 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Aug 9 13:29:46 2013 +0000 Add *.egg-info directories to the .gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2d931b8..53237f5 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ bin var sdist develop-eggs +*.egg-info/* .installed.cfg MANIFEST

1 0

[bridgedb/master] Add pylint persistent report files to the .gitignore.
by isis＠torproject.org 09 Aug '13

09 Aug '13

commit 1f072e86260e12e025c105d984e81451be10bb83 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Aug 9 13:30:54 2013 +0000 Add pylint persistent report files to the .gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 53237f5..643f075 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ installed-files.txt # Unit test / coverage reports .coverage .tox +*.prof nosetests.xml # Translations

1 0

[bridgedb/master] Add git mergetool backup and save files to the .gitignore.
by isis＠torproject.org 09 Aug '13

09 Aug '13

commit 72fee1a0842e05c58217c7fc0a76688744e34c90 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Aug 9 13:31:42 2013 +0000 Add git mergetool backup and save files to the .gitignore. --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 643f075..c10e075 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,10 @@ nosetests.xml .\#* *~ +# Git mergetool backups and save files +*.orig +*.bak + # Mr Developer .mr.developer.cfg .project

1 0

[bridgedb/master] Change bridge-descriptors entry in .gitignore to fuzzy match filenames.
by isis＠torproject.org 09 Aug '13

09 Aug '13

commit 92e05b044e39e71a8fcdd9566f5dc4e5865b3292 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Aug 9 13:32:39 2013 +0000 Change bridge-descriptors entry in .gitignore to fuzzy match filenames. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c10e075..71b2c84 100644 --- a/.gitignore +++ b/.gitignore @@ -72,7 +72,7 @@ run/* */assignments.log */bridgedist.log -*bridge-descriptors +*bridge-descriptors* *cached-descriptors* *networkstatus-bridges *blocked-bridges

1 0

[bridgedb/master] Add cached-extrainfo files to .gitignore.
by isis＠torproject.org 09 Aug '13

09 Aug '13

commit 2270646d7ba153720308803b905bbb225e2a8a8a Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Aug 9 13:34:06 2013 +0000 Add cached-extrainfo files to .gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 71b2c84..854885e 100644 --- a/.gitignore +++ b/.gitignore @@ -74,6 +74,7 @@ run/* *bridge-descriptors* *cached-descriptors* +*cached-extrainfo* *networkstatus-bridges *blocked-bridges *extra-infos

1 0

[bridgedb/master] Merge branch 'hotfix/5332-lib-gitignore'
by isis＠torproject.org 09 Aug '13

09 Aug '13

commit 04af1750b2a897f337d010ad737a9638c026fa8c Merge: 8115774 2270646 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Aug 9 15:45:09 2013 +0000 Merge branch 'hotfix/5332-lib-gitignore' .gitignore | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)

1 0

[bridgedb/master] Merge remote-tracking branch 'sysrqb/bug9264_temporary_fix'
by isis＠torproject.org 09 Aug '13

09 Aug '13

commit 9490872322b8907931010a0fc06f2763d6951878 Merge: 04af175 975380d Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Aug 9 16:17:44 2013 +0000 Merge remote-tracking branch 'sysrqb/bug9264_temporary_fix' lib/bridgedb/Main.py | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-)

1 0