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

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 14 Mar '14

14 Mar '14

commit 779486e9eb5cc8a2a1a69d5fed40ab8ac12b98f0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 14 03:15:02 2014 +0000 Update translations for bridgedb --- kk/LC_MESSAGES/bridgedb.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/kk/LC_MESSAGES/bridgedb.po b/kk/LC_MESSAGES/bridgedb.po index 2528872..3076c85 100644 --- a/kk/LC_MESSAGES/bridgedb.po +++ b/kk/LC_MESSAGES/bridgedb.po @@ -4,13 +4,14 @@ # # Translators: # Translators: +# Nurlan Rakhimzhanov <nurlan.rakhimzhanov(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2014-03-13 09:33+0000\n" -"Last-Translator: Phoul <colin(a)torproject.org>\n" +"PO-Revision-Date: 2014-03-14 03:14+0000\n" +"Last-Translator: Nurlan Rakhimzhanov <nurlan.rakhimzhanov(a)gmail.com>\n" "Language-Team: Kazakh (http://www.transifex.com/projects/p/torproject/language/kk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" #: lib/bridgedb/templates/base.html:33 msgid "What are bridges?" -msgstr "" +msgstr "Көріплер дегеніміз не?" #: lib/bridgedb/templates/base.html:34 #, python-format @@ -31,7 +32,7 @@ msgstr "" #: lib/bridgedb/templates/base.html:39 msgid "I need an alternative way of getting bridges!" -msgstr "" +msgstr "Көпірлер алудың маған басқа жолы керек!" #: lib/bridgedb/templates/base.html:40 #, python-format @@ -43,7 +44,7 @@ msgstr "" #: lib/bridgedb/templates/base.html:48 msgid "My bridges don't work! I need help!" -msgstr "" +msgstr "Менің көпірлерім жұмыс істемейді! Көмек қажет!" #: lib/bridgedb/templates/base.html:49 #, python-format @@ -70,7 +71,7 @@ msgstr "" #: lib/bridgedb/templates/captcha.html:8 msgid "Type the two words" -msgstr "" +msgstr "Екі сөз жазыңыз" #: lib/bridgedb/templates/index.html:6 msgid "Step 1"

1 0

r26649: {website} Delete the aforementioned FAQ entry (not frequently asked, re (website/trunk/docs/en)
by Matt Pagan 14 Mar '14

14 Mar '14

Author: mttp Date: 2014-03-14 02:51:36 +0000 (Fri, 14 Mar 2014) New Revision: 26649 Modified: website/trunk/docs/en/faq.wml Log: Delete the aforementioned FAQ entry (not frequently asked,really) Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2014-03-14 02:46:20 UTC (rev 26648) +++ website/trunk/docs/en/faq.wml 2014-03-14 02:51:36 UTC (rev 26649) @@ -227,7 +227,6 @@ <p>Development:</p> <ul> - <li><a href="#WhoIsResponsible">Who is responsible for Tor?</a></li> <li><a href="#VersionNumbers">What do these weird version numbers mean?</a></li> <li><a href="#PrivateTorNetwork">How do I set up my own private @@ -3525,21 +3524,6 @@ <a id="Development"></a> <h2><a class="anchor">Development:</a></h2> - <a id="WhoIsResponsible"></a> - <h3><a class="anchor" href="#WhoIsResponsible">Who is responsible - for Tor?</a></h3> - - <p> - <a href="http://www.freehaven.net/~arma/cv.html">Roger Dingledine</a>, - <a href="http://www.wangafu.net/~nickm/">Nick Mathewson</a>, and - <a href="http://charon.persephoneslair.org/~andrea/">Andrea Shepard</a> - are the main developers of Tor. You can read more at - <a href="https://www.torproject.org/about/corepeople">Tor's People - page</a>. - </p> - - <hr> - <a id="VersionNumbers"></a> <h3><a class="anchor" href="#VersionNumbers">What do these weird version numbers mean?</a></h3>

1 0

r26648: {website} Added Andrea's name to the faq as a tor developer. (website/trunk/docs/en)
by Matt Pagan 14 Mar '14

14 Mar '14

Author: mttp Date: 2014-03-14 02:46:20 +0000 (Fri, 14 Mar 2014) New Revision: 26648 Modified: website/trunk/docs/en/faq.wml Log: Added Andrea's name to the faq as a tor developer. Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2014-03-13 18:07:42 UTC (rev 26647) +++ website/trunk/docs/en/faq.wml 2014-03-14 02:46:20 UTC (rev 26648) @@ -3530,9 +3530,10 @@ for Tor?</a></h3> <p> - <a href="http://www.freehaven.net/~arma/cv.html">Roger Dingledine</a> and - <a href="http://www.wangafu.net/~nickm/">Nick Mathewson</a> are the main - developers of Tor. You can read more at + <a href="http://www.freehaven.net/~arma/cv.html">Roger Dingledine</a>, + <a href="http://www.wangafu.net/~nickm/">Nick Mathewson</a>, and + <a href="http://charon.persephoneslair.org/~andrea/">Andrea Shepard</a> + are the main developers of Tor. You can read more at <a href="https://www.torproject.org/about/corepeople">Tor's People page</a>. </p>

1 0

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 14 Mar '14

14 Mar '14

commit f41fd923963612e6c133a3f05a23c48a1ef325a5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 14 02:45:34 2014 +0000 Update translations for tor-launcher-progress --- zh_HK/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/progress.dtd b/zh_HK/progress.dtd index f58ca74..1c294e2 100644 --- a/zh_HK/progress.dtd +++ b/zh_HK/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> +<!ENTITY torprogress.dialog.title "Tor的狀態"> <!ENTITY torprogress.openSettings "打開設定"> <!ENTITY torprogress.heading "Connecting to the Tor network"> <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 14 Mar '14

14 Mar '14

commit a0160f6ef44be1478391eb3109f8b84188758e79 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 14 01:45:08 2014 +0000 Update translations for tsum --- zh_HK/short-user-manual_zh_HK_noimg.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/short-user-manual_zh_HK_noimg.xhtml b/zh_HK/short-user-manual_zh_HK_noimg.xhtml index f28fedb..d4ce28d 100644 --- a/zh_HK/short-user-manual_zh_HK_noimg.xhtml +++ b/zh_HK/short-user-manual_zh_HK_noimg.xhtml @@ -9,7 +9,7 @@ <p>請明白我們所提供的支援是自願性質。我們每天亦接收到很多的電郵。如未能即時回覆, 請不要擔心。</p> <h2 id="how-tor-works">Tor是如何運作</h2> <p>Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet.</p> - <p>The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay.</p> + <p>上面的圖片顯示用戶使用Tor在瀏覽不同的網站。綠色的顯示器代表在Tor網絡中的傳達點, 而三個鑰匙代表在用戶和每個傳達點之間的加密層。</p> <p>Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination.</p> <p>If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <strong>https</strong>://torproject.org/, not <strong>http</strong>://torproject.org/).</p> <h2 id="how-to-download-tor">How to download Tor</h2>

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 14 Mar '14

14 Mar '14

commit 7f1bc9b293ab5ba50587d45251a8c4a89850c264 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 14 01:15:08 2014 +0000 Update translations for tsum --- zh_HK/short-user-manual_zh_HK_noimg.xhtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_HK/short-user-manual_zh_HK_noimg.xhtml b/zh_HK/short-user-manual_zh_HK_noimg.xhtml index c62f83e..f28fedb 100644 --- a/zh_HK/short-user-manual_zh_HK_noimg.xhtml +++ b/zh_HK/short-user-manual_zh_HK_noimg.xhtml @@ -6,8 +6,8 @@ <body> <h1 id="the-short-user-manual">簡短用戶手冊</h1> <p>本用戶手冊包含有關下載和使用Tor，以及當無法連接到網絡時的各種資料信息。如果您在本手冊內找不到您問題的答案，請寄電郵查詢: help(a)rt.torproject.org</p> - <p>Please note that we are providing support on a voluntary basis, and we get a lot of emails every single day. There is no need to worry if we don't get back to you straight away.</p> - <h2 id="how-tor-works">How Tor works</h2> + <p>請明白我們所提供的支援是自願性質。我們每天亦接收到很多的電郵。如未能即時回覆, 請不要擔心。</p> + <h2 id="how-tor-works">Tor是如何運作</h2> <p>Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet.</p> <p>The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay.</p> <p>Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination.</p>

1 0

[bridgedb/develop] Readd COLLECT_TIMESTAMPS in Main.load()
by isis＠torproject.org 13 Mar '14

13 Mar '14

commit b0e7ef1a5eb4f358d1ad39a6500ec1a43bc09d57 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Mar 13 12:39:36 2014 +0000 Readd COLLECT_TIMESTAMPS in Main.load() It looks like this was accidently deleted in 967f1a6a4290154977ab7c0cc2cbe0560d7246ce when we changed how we parsed the bridge descriptors. This was originally added in 11b83c612090d673d4f23ccaf85be66ec5588e8a. --- lib/bridgedb/Main.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 28d6c8f..adedfaf 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -124,17 +124,18 @@ def load(state, splitter, clear=False): logging.info("Opening bridge-server-descriptor file: '%s'" % fname) f = open(fname, 'r') desc_digests.update(Bridges.getDescriptorDigests(f)) - for bridge in bridges.values(): - if bridge.getID() in timestamps.keys(): - ts = timestamps[bridge.getID()][:] - ts.sort() - for timestamp in ts: - logging.debug( - "Adding/updating timestamps in BridgeHistory for "\ - "'%s' in database: %s" - % (bridge.fingerprint, timestamp)) - bridgedb.Stability.addOrUpdateBridgeHistory( - bridge, timestamp) + if state.COLLECT_TIMESTAMPS: + for bridge in bridges.values(): + if bridge.getID() in timestamps.keys(): + ts = timestamps[bridge.getID()][:] + ts.sort() + for timestamp in ts: + logging.debug( + "Adding/updating timestamps in BridgeHistory for "\ + "'%s' in database: %s" + % (bridge.fingerprint, timestamp)) + bridgedb.Stability.addOrUpdateBridgeHistory( + bridge, timestamp) logging.debug("Closing bridge-server-descriptor file: '%s'" % fname) f.close()

1 0

[bridgedb/develop] Merge remote-tracking branch 'tpo-sysrqb/bug9264_rebased_3_r1' into develop
by isis＠torproject.org 13 Mar '14

13 Mar '14

commit aec0a06c7cb61b2ef429b2164de576f74ad5b3a4 Merge: 38b3e62 b0e7ef1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 13 22:35:55 2014 +0000 Merge remote-tracking branch 'tpo-sysrqb/bug9264_rebased_3_r1' into develop lib/bridgedb/Bridges.py | 11 ++++++++++- lib/bridgedb/Main.py | 22 ++++++++++++---------- lib/bridgedb/test/test_Bridges.py | 30 ++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 11 deletions(-)

1 0

[bridgedb/develop] Log fingerprint safely and safely iterate over long lists
by isis＠torproject.org 13 Mar '14

13 Mar '14

commit 22b1e2eb898a77e269673bc495b3d412ee4c8673 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Mar 13 12:31:45 2014 +0000 Log fingerprint safely and safely iterate over long lists --- lib/bridgedb/Bridges.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 1dc4f4e..579dfee 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -1251,8 +1251,9 @@ class FilteredBridgeSplitter(BridgeHolder): return index = 0 - logging.debug("Inserting %s into %s ring" % (bridge.fingerprint, self.key)) - for old_bridge in self.bridges: + logging.debug("Inserting %s into splitter" + % (Util.logSafely(bridge.fingerprint))) + for old_bridge in self.bridges[:]: if bridge.fingerprint == old_bridge.fingerprint: self.bridges[index] = bridge break

1 0

[bridgedb/develop] Add a unit test that verifies we don't add duplicate bridges
by isis＠torproject.org 13 Mar '14

13 Mar '14

commit 13fc557b8e4bd094457ca954129dceaa4445d744 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue Mar 4 13:03:48 2014 +0000 Add a unit test that verifies we don't add duplicate bridges Previously we did not check that a bridge was already in a splitter, this resulted in adding bridges with (almost) identical information and #9264. --- lib/bridgedb/test/test_Bridges.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/lib/bridgedb/test/test_Bridges.py b/lib/bridgedb/test/test_Bridges.py index 4e0b27e..421b308 100644 --- a/lib/bridgedb/test/test_Bridges.py +++ b/lib/bridgedb/test/test_Bridges.py @@ -109,3 +109,33 @@ class BridgeClassTest(unittest.TestCase): digests = Bridges.getExtraInfoDigests(StringIO(test)) self.failUnlessIn(digest, digests) self.failUnlessEqual(content, digests[digest].read()) + + def test_splitterBridgeInsertion(self): + key = "Testing-Bridges-To-Rings" + splitter = Bridges.FilteredBridgeSplitter(key) + + bridge1 = Bridges.Bridge('unamed1', '1.2.3.5', 9100, + 'a1cc8dfef1fa11af9c40af1054df9daf45250550') + bridge1.setStatus(running = True) + bridge2 = Bridges.Bridge('unamed2', '1.2.3.4', 8080, + 'a1cc8dfef1fa11af9c40af1054df9daf45250551') + bridge2.setStatus(running = True) + bridge3 = Bridges.Bridge('unamed3', '5.2.3.4', 8080, + 'b1cc8dfef1fa11af9c40af1054df9daf45250552') + bridge3.setStatus(running = True) + bridge4 = Bridges.Bridge('unamed3', '5.2.3.4', 8080, + 'b1cc8dfef1fa11af9c40af1054df9daf45250552') + bridge4.setStatus(running = True) + + self.failUnlessEqual(len(splitter), 0) + splitter.insert(bridge1) + splitter.insert(bridge2) + splitter.insert(bridge3) + # Check that all were inserted + self.failUnlessEqual(len(splitter), 3) + splitter.insert(bridge1) + # Check that the same bridge is not inserted twice + self.failUnlessEqual(len(splitter), 3) + splitter.insert(bridge4) + # Check that identical bridges are not inserted twice + self.failUnlessEqual(len(splitter), 3)

1 0