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

[bridgedb/master] Add bridgedb key/db/descriptor/logs/etc files to .gitignore.
by asn＠torproject.org 23 Jul '13

23 Jul '13

commit f5545802d0ab4beb8464f3f3a9f0ec4f2128858d Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jul 4 22:45:35 2013 +0000 Add bridgedb key/db/descriptor/logs/etc files to .gitignore. --- .gitignore | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.gitignore b/.gitignore index e74a354..c264250 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,29 @@ nosetests.xml # etags/ctags TAGS + +# BridgeDB specific files: +#------------------------- + +# databases and keys +*.db +*.sqlite +secret_key +cert +privkey.pem +bridgedb-gpg.sec + +# pid file and runtime directory +bridgedb.pid +run/* + +# logs +*/bridgedb*.log +*/assignments.log +*/bridgedist.log + +*bridge-descriptors +*cached-descriptors* +*networkstatus-bridges +*blocked-bridges +*extra-infos

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 23 Jul '13

23 Jul '13

commit 90c98d1fe02bfd91af41597aa732b4505c1aa2df Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 23 22:15:07 2013 +0000 Update translations for gettor --- hr_HR/gettor.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr_HR/gettor.po b/hr_HR/gettor.po index e41f7a6..ae90075 100644 --- a/hr_HR/gettor.po +++ b/hr_HR/gettor.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-07-23 19:18+0000\n" +"PO-Revision-Date: 2013-07-23 21:55+0000\n" "Last-Translator: dlb031 <abuljan031(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 23 Jul '13

23 Jul '13

commit af923d2e46508e5c43c92752c147f99732061aa9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 23 19:45:09 2013 +0000 Update translations for gettor --- hr_HR/gettor.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hr_HR/gettor.po b/hr_HR/gettor.po index 41bcb3f..e41f7a6 100644 --- a/hr_HR/gettor.po +++ b/hr_HR/gettor.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# dlb031 <abuljan031(a)gmail.com>, 2013 # cisterna, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-07-12 17:20+0000\n" -"Last-Translator: cisterna\n" +"PO-Revision-Date: 2013-07-23 19:18+0000\n" +"Last-Translator: dlb031 <abuljan031(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ msgstr "" #: lib/gettor/i18n.py:29 msgid "Thank you for your request." -msgstr "" +msgstr "Hvala na zahtjevu." #: lib/gettor/i18n.py:31 msgid "" @@ -245,7 +246,7 @@ msgid "" "is no complete public list of them, even if your ISP is filtering\n" "connections to all the known Tor relays, they probably won't be able\n" "to block all the bridges." -msgstr "" +msgstr "Ako Vaša Internet veza blokira pristup Tor mreži, možda će Vam trebati mostni relej. Mostni releji (ili skraćeno \"mostovi\") su Tor releji koji nisu navedeni u glavnom imeniku. Kako ne postoji putpuna javna lista, čak i ako vaš ISP filtrira veze prema svim poznatim Tor relejima, vjerojatno neće moći blokirati sve mostove." #: lib/gettor/i18n.py:167 msgid "" @@ -259,7 +260,7 @@ msgstr "" msgid "" "It is also possible to fetch bridges with a web browser at the following\n" "url: https://bridges.torproject.org/" -msgstr "" +msgstr "Također je moguće dobaviti mostne releje s web browserom na slijedećem url-u: https://bridges.torproject.org/" #: lib/gettor/i18n.py:175 msgid ""

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 23 Jul '13

23 Jul '13

commit 04abc441ddc2c8cbc479a5a1a958b65ba00d1cd4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 23 12:46:34 2013 +0000 Update translations for torbirdy --- th/torbirdy.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/th/torbirdy.dtd b/th/torbirdy.dtd index 95b2503..32cb615 100644 --- a/th/torbirdy.dtd +++ b/th/torbirdy.dtd @@ -16,8 +16,8 @@ <!ENTITY torbirdy.prefs.extra2.key ""> <!ENTITY torbirdy.prefs.proxy.label "ตั้งค่าพร็อกซี"> <!ENTITY torbirdy.prefs.privacy.label "ตั้งค่าความเป็นส่วนตัว"> -<!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label ""> +<!ENTITY torbirdy.prefs.enigmail.label "ตั้งค่า Enigmail"> +<!ENTITY torbirdy.prefs.security.label "ตั้งค่าความปลอดภัย"> <!ENTITY torbirdy.prefs.recommended.text "ใช้การตั้งค่าพร็อกซีที่แนะนำสำหรับ TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "น"> <!ENTITY torbirdy.prefs.anonservice.text "เลือกบริการปกปิดชื่อ"> @@ -51,9 +51,9 @@ <!ENTITY torbirdy.prefs.enigmail.keyserver.label ""> <!ENTITY torbirdy.prefs.enigmail.keyserver.key ""> -<!ENTITY torbirdy.panel.usetor.label ""> +<!ENTITY torbirdy.panel.usetor.label "ใช้ Tor Onion Router"> <!ENTITY torbirdy.panel.usejondo.label ""> -<!ENTITY torbirdy.panel.usewhonix.label ""> +<!ENTITY torbirdy.panel.usewhonix.label "ใช้ Whonix"> <!ENTITY torbirdy.panel.preferences.label ""> <!ENTITY torbirdy.firstrun.title "">

1 0

[tor/master] Fix bug9309, and n_noncanonical count/continue code
by andrea＠torproject.org 23 Jul '13

23 Jul '13

commit 5d4b5018be5d85162d96cc3781acbf892f33bc21 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 23 11:52:10 2013 +0200 Fix bug9309, and n_noncanonical count/continue code When we moved channel_matches_target_addr_for_extend() into a separate function, its sense was inverted from what one might expect, and we didn't have a ! in one place where we should have. Found by skruffy. --- changes/bug9309 | 6 ++++++ src/or/channel.c | 4 ++-- src/or/channeltls.c | 5 ++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/changes/bug9309 b/changes/bug9309 new file mode 100644 index 0000000..38c462b --- /dev/null +++ b/changes/bug9309 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - When evaluating whether to use a connection that we haven't + decided is canonical using a recent link protocol version, + decide that it's canonical only if it used address _does_ + match the desired address. Fixes bug 9309; bugfix on + 0.2.4.4-alpha. Reported by skruffy. diff --git a/src/or/channel.c b/src/or/channel.c index 98c23d9..05f269b 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -3090,7 +3090,7 @@ channel_get_for_extend(const char *digest, if (chan->state != CHANNEL_STATE_OPEN) { /* If the address matches, don't launch a new connection for this * circuit. */ - if (!channel_matches_target_addr_for_extend(chan, target_addr)) + if (channel_matches_target_addr_for_extend(chan, target_addr)) ++n_inprogress_goodaddr; continue; } @@ -4106,7 +4106,7 @@ channel_matches_extend_info(channel_t *chan, extend_info_t *extend_info) } /** - * Check if a channel matches a given target address + * Check if a channel matches a given target address; return true iff we do. * * This function calls into the lower layer and asks if this channel thinks * it matches a given target address for circuit extension purposes. diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 60693da..d758d22 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -546,7 +546,7 @@ channel_tls_matches_extend_info_method(channel_t *chan, } /** - * Check if we match a target address + * Check if we match a target address; return true iff we do. * * This implements the matches_target method for channel_tls t_; the upper * layer wants to know if this channel matches a target address when extending @@ -563,8 +563,7 @@ channel_tls_matches_target_method(channel_t *chan, tor_assert(target); tor_assert(tlschan->conn); - return tor_addr_compare(&(tlschan->conn->real_addr), - target, CMP_EXACT); + return tor_addr_eq(&(tlschan->conn->real_addr), target); } /**

1 0

[tor/master] fix typo
by andrea＠torproject.org 23 Jul '13

23 Jul '13

commit 2920d670debaaa7a306bedd5fd7ce9c3e72124e6 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jul 18 23:35:20 2013 -0400 fix typo --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index bade531..d13ec20 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1679,7 +1679,7 @@ is non-zero): If it hits this threshold, it will begin killing circuits until it has recovered at least 10% of this memory. Do not set this option too low, or your relay may be unreliable under load. This option only - effects circuit queues, so the actual process size will be larger than + affects circuit queues, so the actual process size will be larger than this. (Default: 8GB) DIRECTORY SERVER OPTIONS

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 23 Jul '13

23 Jul '13

commit 68e98ef27912e61ed9353c81a88df0b3101767c5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 23 12:15:15 2013 +0000 Update translations for tsum --- th/short-user-manual_th_noimg.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/th/short-user-manual_th_noimg.xhtml b/th/short-user-manual_th_noimg.xhtml index 2a3b20b..08d034d 100644 --- a/th/short-user-manual_th_noimg.xhtml +++ b/th/short-user-manual_th_noimg.xhtml @@ -24,7 +24,7 @@ คุณสามารถใช้ Tor สำหรับอุปกรณ์แอนดรอยด์โดยติดตั้งแพคเกจที่มีชื่อว่า Orbot สำหรับข้อมูลเกี่ยวกับการดาวน์โหลดและติดตั้ง Orbot กรุณาดูจาก<a href="https://www.torproject.org/docs/android.html.en">เวปไซต์โครงการ Tor</a> We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>. <h3 id="how-to-verify-that-you-have-the-right-version">วิธีตรวจสอบว่าคุณได้รับเวอร์ชั่นที่ถูกต้อง</h3> - Before running the Tor Browser Bundle, you should make sure that you have the right version. + ก่อนติดตั้ง Tor Browser Bundle กรุณาตรวจสอบให้แน่ใจว่าคุณได้รับโปรแกรมเวอร์ชั่นที่ถูกต้อง The software you receive is accompanied by a file with the same name as the bundle and the extension .asc. This .asc file is a GPG signature, and will allow you to verify the file you've downloaded is exactly the one that we intended you to get. Before you can verify the signature, you will have to download and install GnuPG: Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a> Linux: Most Linux distributions come with GnuPG preinstalled.

1 0

[tor/maint-0.2.4] Fix bug9309, and n_noncanonical count/continue code
by andrea＠torproject.org 23 Jul '13

23 Jul '13

commit 1d2e8020b7be5aff08cfde6f94c24b145625c1ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 23 11:52:10 2013 +0200 Fix bug9309, and n_noncanonical count/continue code When we moved channel_matches_target_addr_for_extend() into a separate function, its sense was inverted from what one might expect, and we didn't have a ! in one place where we should have. Found by skruffy. --- changes/bug9309 | 6 ++++++ src/or/channel.c | 4 ++-- src/or/channeltls.c | 5 ++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/changes/bug9309 b/changes/bug9309 new file mode 100644 index 0000000..38c462b --- /dev/null +++ b/changes/bug9309 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - When evaluating whether to use a connection that we haven't + decided is canonical using a recent link protocol version, + decide that it's canonical only if it used address _does_ + match the desired address. Fixes bug 9309; bugfix on + 0.2.4.4-alpha. Reported by skruffy. diff --git a/src/or/channel.c b/src/or/channel.c index 4e9086f..602797d 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -3037,7 +3037,7 @@ channel_get_for_extend(const char *digest, if (chan->state != CHANNEL_STATE_OPEN) { /* If the address matches, don't launch a new connection for this * circuit. */ - if (!channel_matches_target_addr_for_extend(chan, target_addr)) + if (channel_matches_target_addr_for_extend(chan, target_addr)) ++n_inprogress_goodaddr; continue; } @@ -4053,7 +4053,7 @@ channel_matches_extend_info(channel_t *chan, extend_info_t *extend_info) } /** - * Check if a channel matches a given target address + * Check if a channel matches a given target address; return true iff we do. * * This function calls into the lower layer and asks if this channel thinks * it matches a given target address for circuit extension purposes. diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 60693da..d758d22 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -546,7 +546,7 @@ channel_tls_matches_extend_info_method(channel_t *chan, } /** - * Check if we match a target address + * Check if we match a target address; return true iff we do. * * This implements the matches_target method for channel_tls t_; the upper * layer wants to know if this channel matches a target address when extending @@ -563,8 +563,7 @@ channel_tls_matches_target_method(channel_t *chan, tor_assert(target); tor_assert(tlschan->conn); - return tor_addr_compare(&(tlschan->conn->real_addr), - target, CMP_EXACT); + return tor_addr_eq(&(tlschan->conn->real_addr), target); } /**

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 23 Jul '13

23 Jul '13

commit ae7287e79b6b7e5f810c2420eb255cc8d9629a29 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 23 11:45:15 2013 +0000 Update translations for tsum --- th/short-user-manual_th_noimg.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/th/short-user-manual_th_noimg.xhtml b/th/short-user-manual_th_noimg.xhtml index 8e30a06..2a3b20b 100644 --- a/th/short-user-manual_th_noimg.xhtml +++ b/th/short-user-manual_th_noimg.xhtml @@ -23,7 +23,7 @@ <h3 id="tor-for-smartphones">Tor สำหรับสมาร์ทโฟน</h3> คุณสามารถใช้ Tor สำหรับอุปกรณ์แอนดรอยด์โดยติดตั้งแพคเกจที่มีชื่อว่า Orbot สำหรับข้อมูลเกี่ยวกับการดาวน์โหลดและติดตั้ง Orbot กรุณาดูจาก<a href="https://www.torproject.org/docs/android.html.en">เวปไซต์โครงการ Tor</a> We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>. - <h3 id="how-to-verify-that-you-have-the-right-version">How to verify that you have the right version</h3> + <h3 id="how-to-verify-that-you-have-the-right-version">วิธีตรวจสอบว่าคุณได้รับเวอร์ชั่นที่ถูกต้อง</h3> Before running the Tor Browser Bundle, you should make sure that you have the right version. The software you receive is accompanied by a file with the same name as the bundle and the extension .asc. This .asc file is a GPG signature, and will allow you to verify the file you've downloaded is exactly the one that we intended you to get. Before you can verify the signature, you will have to download and install GnuPG:

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 23 Jul '13

23 Jul '13

commit c8db4d63de163f603e5051ffa5bb8dce88714736 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 23 11:15:16 2013 +0000 Update translations for tsum --- th/short-user-manual_th_noimg.xhtml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/th/short-user-manual_th_noimg.xhtml b/th/short-user-manual_th_noimg.xhtml index 92d2626..8e30a06 100644 --- a/th/short-user-manual_th_noimg.xhtml +++ b/th/short-user-manual_th_noimg.xhtml @@ -14,14 +14,14 @@ หากคุณกำลังส่งข้อมูลสำคัญ เช่น เข้าสู่เวปไซต์ด้วย username และ password กรุณาตรวจสอบให้มั่นใจว่าคุณกำลังใช้ HTTPS (เช่น https://torproject.org/, ไม่ใช่ http://torproject.org/) <h2 id="how-to-download-tor">วิธีการดาวน์โหลด Tor</h2> The bundle we recommend to most users is the <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>. This bundle contains a browser preconfigured to safely browse the Internet through Tor, and requires no installation. You download the bundle, extract the archive, and start Tor. - There are two different ways to get hold of the Tor software. You can either browse to the <a href="https://www.torproject.org/">Tor Project website</a> and download it there, or you can use GetTor, the email autoresponder. - <h3 id="how-to-get-tor-via-email">How to get Tor via email</h3> - To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with windows in the body of the message. You can leave the subject blank. - You can also request the Tor Browser Bundle for Mac OS X (write macos-i386), and Linux (write linux-i386 for 32-bit systems or linux-x86_64 for 64-bit systems). - If you want a translated version of Tor, write help instead. You will then receive an email with instructions and a list of available languages. - Note: The Tor Browser Bundles for Linux and Mac OS X are rather large, and you will not be able to receive any of these bundles with a Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you want, send an email to help(a)rt.torproject.org and we will give you a list of website mirrors to use. - <h3 id="tor-for-smartphones">Tor for smartphones</h3> - You can get Tor on your Android device by installing the package named Orbot. For information about how to download and install Orbot, please see the <a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>. + คุณสามารถดาวน์โหลดซอฟต์แวร์ Tor ได้ 2 วิธี โดยการเปิด <a href="https://www.torproject.org/">เวปไซต์โครงการ Tor</a> แล้วดาวน์โหลดจากที่นั่น หรือใช้ GetTor ซึ่งจะตอบอีเมลโดยอัตโนมัติ + <h3 id="how-to-get-tor-via-email">วิธีการรับโปรแกรม Tor ผ่านอีเมล</h3> + คุณสามารถรับโปรแกรม Tor Browser Bundle เวอร์ชันภาษาอังกฤษ สำหรับวินโดวส์ โดยส่งอีเมลไปยัง gettor(a)torproject.org พร้อมกับพิมพ์ข้อความว่า windows ในอีเมล โดยไม่จำเป็นต้องใส่หัวข้อจดหมาย + คุณยังสามารถขอรับโปรแกรม Tor Browser Bundle สำหรับ Mac OS X (พิมพ์ macos-i386), และลีนุกซ์ (พิมพ์ linux-i386 สำหรับระบบ 32-bit หรือ linux-x86_64 สำหรับระบบ 64-bit). + หากคุณต้องการโปรแกรม Tor เวอร์ชั่นที่แปลเป็นภาษาอื่น ให้พิมพ์คำว่า help แทน จากนั้นคุณจะได้รับอีเมลที่บอกคำแนะนำและรายชื่อภาษาที่มีให้ดาวน์โหลด + หมายเหตุ: โปรแกรม Tor Browser Bundles สำหรับ Linux and Mac OS X มีขนาดไฟล์ค่อนข้างใหญ่ และคุณจะไม่สามารถรับโปรแกรมด้วยบัญชี Gmail, Hotmail หรือ Yahoo ได้ ถ้าคุณไม่สามารถรับโปรแกรมที่ต้องการ กรุณาส่งอีเมลไปยัง help(a)rt.torproject.org และเราจะส่งรายชื่อเวปไซต์ mirror ที่คุณสามารถเข้าไปดาวน์โหลดไปให้ + <h3 id="tor-for-smartphones">Tor สำหรับสมาร์ทโฟน</h3> + คุณสามารถใช้ Tor สำหรับอุปกรณ์แอนดรอยด์โดยติดตั้งแพคเกจที่มีชื่อว่า Orbot สำหรับข้อมูลเกี่ยวกับการดาวน์โหลดและติดตั้ง Orbot กรุณาดูจาก<a href="https://www.torproject.org/docs/android.html.en">เวปไซต์โครงการ Tor</a> We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>. <h3 id="how-to-verify-that-you-have-the-right-version">How to verify that you have the right version</h3> Before running the Tor Browser Bundle, you should make sure that you have the right version.

1 0