- tor-commits - lists.torproject.org

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 27 Jan '16

27 Jan '16

commit b269a42db2720332276d83e66f54a52fe3d94a7d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 19:15:03 2016 +0000 Update translations for bridgedb --- hy_AM/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hy_AM/LC_MESSAGES/bridgedb.po b/hy_AM/LC_MESSAGES/bridgedb.po index ec851b6..b76d811 100644 --- a/hy_AM/LC_MESSAGES/bridgedb.po +++ b/hy_AM/LC_MESSAGES/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-01-26 17:47+0000\n" +"PO-Revision-Date: 2016-01-26 19:12+0000\n" "Last-Translator: Sergei <serjsafarian(a)gmail.com>\n" "Language-Team: Armenian (Armenia) (http://www.transifex.com/otf/torproject/language/hy_AM/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "" +msgstr "Կներեք։ Ձեր հայտի հետ խնդիր առաջացավ։" #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" @@ -49,15 +49,15 @@ msgstr "" #: bridgedb/https/templates/base.html:88 msgid "Contact" -msgstr "" +msgstr "Կապորդներ" #: bridgedb/https/templates/bridges.html:35 msgid "Select All" -msgstr "" +msgstr "Ընտրել բոլորը" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "" +msgstr "Ցույց տալ QR ծածկագիրը" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 27 Jan '16

27 Jan '16

commit 546412ff0db3c370568e4a1a6bc394c3f5222600 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 18:15:03 2016 +0000 Update translations for bridgedb --- hy_AM/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hy_AM/LC_MESSAGES/bridgedb.po b/hy_AM/LC_MESSAGES/bridgedb.po index 3145ed9..ec851b6 100644 --- a/hy_AM/LC_MESSAGES/bridgedb.po +++ b/hy_AM/LC_MESSAGES/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-01-26 17:45+0000\n" +"PO-Revision-Date: 2016-01-26 17:47+0000\n" "Last-Translator: Sergei <serjsafarian(a)gmail.com>\n" "Language-Team: Armenian (Armenia) (http://www.transifex.com/otf/torproject/language/hy_AM/)\n" "MIME-Version: 1.0\n" @@ -37,7 +37,7 @@ msgstr "" #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" -msgstr "" +msgstr "Հայտնել սխալի մասին" #: bridgedb/https/templates/base.html:82 msgid "Source Code"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 27 Jan '16

27 Jan '16

commit 40c7532e3b305ed16479dfbdbf8bc788966d2036 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 17:45:04 2016 +0000 Update translations for bridgedb --- hy_AM/LC_MESSAGES/bridgedb.po | 340 +++++++++++++++++++++-------------------- 1 file changed, 171 insertions(+), 169 deletions(-) diff --git a/hy_AM/LC_MESSAGES/bridgedb.po b/hy_AM/LC_MESSAGES/bridgedb.po index a16d2ea..3145ed9 100644 --- a/hy_AM/LC_MESSAGES/bridgedb.po +++ b/hy_AM/LC_MESSAGES/bridgedb.po @@ -4,17 +4,19 @@ # # Translators: # mhrach87 <mhrach87(a)gmail.com>, 2014 +# Sergei <serjsafarian(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Armenian (Armenia) (http://www.transifex.com/projects/p/torproject/language/hy_AM/)\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2016-01-26 17:45+0000\n" +"Last-Translator: Sergei <serjsafarian(a)gmail.com>\n" +"Language-Team: Armenian (Armenia) (http://www.transifex.com/otf/torproject/language/hy_AM/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: hy_AM\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -29,57 +31,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "" -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "" + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "" + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "" + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Քայլ %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Ներբեռնել %s Tor Browser %s-ը" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Քայլ %s2%s" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Քայլ %s3%s" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "Ոչ" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "ոչինչ" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "%sԱ%sյո!" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "" -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "Բարի գալուստ BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" -msgstr "Ողջույն ընկեր!" +msgstr "Ողջո՛ւյն, ընկեր։" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -90,7 +217,7 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor". #. TRANSLATORS: Please DO NOT translate "Tor Network". -#: lib/bridgedb/strings.py:47 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -101,7 +228,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -113,7 +240,7 @@ msgstr "" #. regular, or unexciting". Like vanilla ice cream. It refers to bridges #. which do not have Pluggable Transports, and only speak the regular, #. boring Tor protocol. Translate it as you see fit. Have fun with it. -#: lib/bridgedb/strings.py:63 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -122,20 +249,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -143,12 +270,12 @@ msgid "" "%s, %s or %s." msgstr "" -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "" @@ -156,48 +283,48 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:96 +#: bridgedb/strings.py:121 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "" -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "" -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -206,21 +333,21 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:134 +#: bridgedb/strings.py:159 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -228,153 +355,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 msgid "Displays this message." msgstr "" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: lib/bridgedb/strings.py:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "" - -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:115 -#: lib/bridgedb/templates/bridges.html:175 -msgid "Uh oh, spaghettios!" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:121 -msgid "" -"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" -" your bridge lines onto mobile and other devices." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "Քայլ %s1%s" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "Ներբեռնել %s Tor Browser %s-ը" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "Քայլ %s2%s" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "Քայլ %s3%s" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. (These are used to insert HTML5 underlining tags, to mark accesskeys -#. for disabled users.) -#: lib/bridgedb/templates/options.html:38 -#, python-format -msgid "%sJ%sust give me bridges!" -msgstr "" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "Ոչ" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "ոչինչ" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:127 -#, python-format -msgid "%sY%ses!" -msgstr "%sԱ%sյո!" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:151 -#, python-format -msgid "%sG%set Bridges" -msgstr ""

1 0

[stem/master] Proc connections skipped due to incorrect file mode
by atagar＠torproject.org 27 Jan '16

27 Jan '16

commit e04f453314f015ef994f798d1418670f62003386 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 26 09:36:52 2016 -0800 Proc connections skipped due to incorrect file mode toralf reports that proc connection resolution no longer works and think I see the issue. Under python3 we read the contents as unicode but our checks all expect bytes, causing us to skip all the lines. --- stem/util/proc.py | 4 ++-- test/unit/util/proc.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stem/util/proc.py b/stem/util/proc.py index 2b16ccb..7fdd70f 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -393,7 +393,7 @@ def connections(pid): continue try: - with open(proc_file_path) as proc_file: + with open(proc_file_path, 'rb') as proc_file: proc_file.readline() # skip the first line for line in proc_file: @@ -458,7 +458,7 @@ def _decode_proc_address_encoding(addr, is_ipv6): grouping = ip[8 * i:8 * (i + 1)] inverted += [grouping[2 * i:2 * (i + 1)] for i in range(4)][::-1] - ip = ''.join(inverted) + ip = b''.join(inverted) ip = socket.inet_ntop(socket.AF_INET6, base64.b16decode(ip)) diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py index f852820..ee52d21 100644 --- a/test/unit/util/proc.py +++ b/test/unit/util/proc.py @@ -220,7 +220,7 @@ class TestProc(unittest.TestCase): '/proc/net/udp6': False }[param] - open_mock.side_effect = lambda param: { + open_mock.side_effect = lambda param, mode: { '/proc/net/tcp': io.BytesIO(tcp), '/proc/net/udp': io.BytesIO(udp) }[param] @@ -262,7 +262,7 @@ class TestProc(unittest.TestCase): '/proc/net/udp6': False }[param] - open_mock.side_effect = lambda param: { + open_mock.side_effect = lambda param, mode: { '/proc/net/tcp6': io.BytesIO(TCP6_CONTENT), }[param]

1 0

[stem/master] Correct ipv6 little-endian conversion
by atagar＠torproject.org 27 Jan '16

27 Jan '16

commit 88ecc4270799d65a64ec8d52be16297ec932b705 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 26 09:07:48 2016 -0800 Correct ipv6 little-endian conversion Fixing how we convert little-endian ipv6 addresses, thanks to yawning and cypherpunks... https://trac.torproject.org/projects/tor/ticket/18079#comment:24 --- stem/util/proc.py | 31 ++++++++++++++++++++----------- test/unit/util/proc.py | 12 +++--------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/stem/util/proc.py b/stem/util/proc.py index d519e6f..2b16ccb 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -431,8 +431,10 @@ def _decode_proc_address_encoding(addr, is_ipv6): :: "0500000A:0016" -> ("10.0.0.5", 22) + "F804012A4A5190010000000002000000:01BB" -> ("2a01:4f8:190:514a::2", 443) :param str addr: proc address entry to be decoded + :param bool is_ipv6: if we should treat the address as ipv6 :returns: **tuple** of the form **(addr, port)**, with addr as a string and port an int """ @@ -441,17 +443,24 @@ def _decode_proc_address_encoding(addr, is_ipv6): port = int(port, 16) # the port is represented as a two-byte hexadecimal number - # The IP address portion is a little-endian four-byte hexadecimal number. - # That is, the least significant byte is listed first, so we need to reverse - # the order of the bytes to convert it to an IP address. - # - # This needs to account for the endian ordering as per... - # - # http://code.google.com/p/psutil/issues/detail?id=201 - # https://trac.torproject.org/projects/tor/ticket/4777 - - ip_encoded = base64.b16decode(ip)[::-1] if sys.byteorder == 'little' else base64.b16decode(ip) - ip = socket.inet_ntop(socket.AF_INET6 if is_ipv6 else socket.AF_INET, ip_encoded) + if not is_ipv6: + ip_encoded = base64.b16decode(ip)[::-1] if sys.byteorder == 'little' else base64.b16decode(ip) + ip = socket.inet_ntop(socket.AF_INET, ip_encoded) + else: + if sys.byteorder == 'little': + # Group into eight characters, then invert in pairs... + # + # https://trac.torproject.org/projects/tor/ticket/18079#comment:24 + + inverted = [] + + for i in range(4): + grouping = ip[8 * i:8 * (i + 1)] + inverted += [grouping[2 * i:2 * (i + 1)] for i in range(4)][::-1] + + ip = ''.join(inverted) + + ip = socket.inet_ntop(socket.AF_INET6, base64.b16decode(ip)) return (ip, port) diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py index 4b7d37f..f852820 100644 --- a/test/unit/util/proc.py +++ b/test/unit/util/proc.py @@ -247,16 +247,12 @@ class TestProc(unittest.TestCase): pid = 1111 listdir_mock.side_effect = lambda param: { - '/proc/%s/fd' % pid: ['1', '2', '3', '4'], + '/proc/%s/fd' % pid: ['1', '2'], }[param] readlink_mock.side_effect = lambda param: { '/proc/%s/fd/1' % pid: 'socket:[42088802]', '/proc/%s/fd/2' % pid: 'socket:[41691357]', - '/proc/%s/fd/3' % pid: 'socket:[41878761]', - '/proc/%s/fd/4' % pid: 'socket:[41825895]', - '/proc/%s/fd/5' % pid: 'socket:[41512577]', - '/proc/%s/fd/6' % pid: 'socket:[14347030]', # this shouldn't be present due to being unestablished }[param] path_exists_mock.side_effect = lambda param: { @@ -271,10 +267,8 @@ class TestProc(unittest.TestCase): }[param] expected_results = [ - ('0:2::190:514a:2a01:4f8', 443, 'ffff:189::a000:4140:2001:638', 40435, 'tcp', True), - ('0:2::190:514a:2a01:4f8', 443, '563b:1526:aabb:0:2:2:2001:858', 44469, 'tcp', True), - ('509:9e4b:0:ffff::', 5222, '4e36:8621:0:ffff::', 38330, 'tcp', True), - ('0:2::190:514a:2a01:4f8', 5269, '0:26::126f:11:2001:6f8', 50594, 'tcp', True), + ('2a01:4f8:190:514a::2', 443, '2001:638:a000:4140::ffff:189', 40435, 'tcp', True), + ('2a01:4f8:190:514a::2', 443, '2001:858:2:2:aabb:0:563b:1526', 44469, 'tcp', True), ] self.assertEqual(expected_results, proc.connections(pid))

1 0

[metrics-web/master] squash! Remove one country code, add four.
by karsten＠torproject.org 27 Jan '16

27 Jan '16

commit 1fea9125e1fa38b25254c27dd75719dc96bff376 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jan 26 17:51:34 2016 +0100 squash! Remove one country code, add four. Fix trivial bug in displaying Curacao on the website. --- website/src/org/torproject/metrics/web/graphs/Countries.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/src/org/torproject/metrics/web/graphs/Countries.java b/website/src/org/torproject/metrics/web/graphs/Countries.java index 7982a8f..574fd0c 100644 --- a/website/src/org/torproject/metrics/web/graphs/Countries.java +++ b/website/src/org/torproject/metrics/web/graphs/Countries.java @@ -80,7 +80,7 @@ public class Countries { this.knownCountries.add("ci:Côte d'Ivoire".split(":")); this.knownCountries.add("hr;Croatia".split(";")); this.knownCountries.add("cu;Cuba".split(";")); - this.knownCountries.add("cw;Curaçao".split(";")); + this.knownCountries.add("cw:Curaçao".split(":")); this.knownCountries.add("cy;Cyprus".split(";")); this.knownCountries.add("cz;Czech Republic".split(";")); this.knownCountries.add("dk;Denmark".split(";"));

1 0

[metrics-web/master] Remove one country code, add four.
by karsten＠torproject.org 27 Jan '16

27 Jan '16

commit 3d7480ea94b5d4fe7b0cfd47821d1029d9fd8265 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jan 26 17:41:12 2016 +0100 Remove one country code, add four. - Remove FX (France, Metropolitan): Wikipedia says this country code was reserved on request of France, but it's neither used by MaxMind nor by little-t-tor. We can safely drop this country code from Metrics. - Add BQ (Bonaire, Sint Eustatius and Saba): This country code was assigned in 2010, and Metrics is missing it. We should add it. - Add CW (Curacao): See BQ, add it. - Add SX (Sint Maarten): See BQ, add it. - Add XK (Kosovo): Wikipedia says that XF is a user-assigned code that is being used by the European Commission, Switzerland, the Deutsche Bundesbank, SWIFT, and other organizations as a temporary country code for Kosovo. MaxMind adds this country code in its GeoIP2 format, and there are actual Tor users from that country code. We should add it to Metrics, too. Fixes #17786. --- modules/clients/country_info.py | 5 ++++- website/rserve/graphs.R | 5 ++++- website/src/org/torproject/metrics/web/graphs/Countries.java | 6 +++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/clients/country_info.py b/modules/clients/country_info.py index e23728e..1a505d0 100644 --- a/modules/clients/country_info.py +++ b/modules/clients/country_info.py @@ -31,6 +31,7 @@ countries = { "bm" : "Bermuda", "bn" : "Brunei", "bo" : "Bolivia", + "bq" : "Bonaire, Sint Eustatius and Saba", "br" : "Brazil", "bs" : "the Bahamas", "bt" : "Bhutan", @@ -53,6 +54,7 @@ countries = { "cr" : "Costa Rica", "cu" : "Cuba", "cv" : "Cape Verde", + "cw" : u"Curaçao", "cx" : "the Christmas Island", "cy" : "Cyprus", "cz" : "the Czech Republic", @@ -75,7 +77,6 @@ countries = { "fm" : "the Federated States of Micronesia", "fo" : "the Faroe Islands", "fr" : "France", - "fx" : "Metropolitan France", "ga" : "Gabon", "gb" : "the United Kingdom", "gd" : "Grenada", @@ -211,6 +212,7 @@ countries = { "ss" : "South Sudan", "st" : u"São Tomé and Príncipe", "sv" : "El Salvador", + "sx" : "Sint Maarten", "sy" : "the Syrian Arab Republic", "sz" : "Swaziland", "tc" : "Turks and Caicos Islands", @@ -244,6 +246,7 @@ countries = { "vu" : "Vanuatu", "wf" : "Wallis and Futuna", "ws" : "Samoa", + "xk" : "Kosovo", "ye" : "Yemen", "yt" : "Mayotte", "za" : "South Africa", diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R index bbb2561..87ac39a 100644 --- a/website/rserve/graphs.R +++ b/website/rserve/graphs.R @@ -29,6 +29,7 @@ countrylist <- list( "bm" = "Bermuda", "bn" = "Brunei", "bo" = "Bolivia", + "bq" = "Bonaire, Sint Eustatius and Saba", "br" = "Brazil", "bs" = "the Bahamas", "bt" = "Bhutan", @@ -51,6 +52,7 @@ countrylist <- list( "cr" = "Costa Rica", "cu" = "Cuba", "cv" = "Cape Verde", + "cw" = "Curaçao", "cx" = "the Christmas Island", "cy" = "Cyprus", "cz" = "the Czech Republic", @@ -73,7 +75,6 @@ countrylist <- list( "fm" = "the Federated States of Micronesia", "fo" = "the Faroe Islands", "fr" = "France", - "fx" = "Metropolitan France", "ga" = "Gabon", "gb" = "the United Kingdom", "gd" = "Grenada", @@ -209,6 +210,7 @@ countrylist <- list( "ss" = "South Sudan", "st" = "São Tomé and Príncipe", "sv" = "El Salvador", + "sx" = "Sint Maarten", "sy" = "the Syrian Arab Republic", "sz" = "Swaziland", "tc" = "Turks and Caicos Islands", @@ -242,6 +244,7 @@ countrylist <- list( "vu" = "Vanuatu", "wf" = "Wallis and Futuna", "ws" = "Samoa", + "xk" = "Kosovo", "ye" = "Yemen", "yt" = "Mayotte", "za" = "South Africa", diff --git a/website/src/org/torproject/metrics/web/graphs/Countries.java b/website/src/org/torproject/metrics/web/graphs/Countries.java index 7a99a46..7982a8f 100644 --- a/website/src/org/torproject/metrics/web/graphs/Countries.java +++ b/website/src/org/torproject/metrics/web/graphs/Countries.java @@ -46,6 +46,8 @@ public class Countries { this.knownCountries.add("bm;Bermuda".split(";")); this.knownCountries.add("bt;Bhutan".split(";")); this.knownCountries.add("bo;Bolivia".split(";")); + this.knownCountries.add("bq;Bonaire, Sint Eustatius and Saba". + split(";")); this.knownCountries.add("ba;Bosnia and Herzegovina".split(";")); this.knownCountries.add("bw;Botswana".split(";")); this.knownCountries.add("bv;Bouvet Island".split(";")); @@ -78,6 +80,7 @@ public class Countries { this.knownCountries.add("ci:Côte d'Ivoire".split(":")); this.knownCountries.add("hr;Croatia".split(";")); this.knownCountries.add("cu;Cuba".split(";")); + this.knownCountries.add("cw;Curaçao".split(";")); this.knownCountries.add("cy;Cyprus".split(";")); this.knownCountries.add("cz;Czech Republic".split(";")); this.knownCountries.add("dk;Denmark".split(";")); @@ -95,7 +98,6 @@ public class Countries { this.knownCountries.add("fo;Faroe Islands".split(";")); this.knownCountries.add("fj;Fiji".split(";")); this.knownCountries.add("fi;Finland".split(";")); - this.knownCountries.add("fx;France, Metropolitan".split(";")); this.knownCountries.add("fr;France".split(";")); this.knownCountries.add("gf;French Guiana".split(";")); this.knownCountries.add("pf;French Polynesia".split(";")); @@ -141,6 +143,7 @@ public class Countries { this.knownCountries.add("ki;Kiribati".split(";")); this.knownCountries.add("kp;North Korea".split(";")); this.knownCountries.add("kr;Korea, Republic of".split(";")); + this.knownCountries.add("xk;Kosovo".split(";")); this.knownCountries.add("kw;Kuwait".split(";")); this.knownCountries.add("kg;Kyrgyzstan".split(";")); this.knownCountries.add("la;Laos".split(";")); @@ -226,6 +229,7 @@ public class Countries { this.knownCountries.add("sc;Seychelles".split(";")); this.knownCountries.add("sl;Sierra Leone".split(";")); this.knownCountries.add("sg;Singapore".split(";")); + this.knownCountries.add("sx;Sint Maarten".split(";")); this.knownCountries.add("sk;Slovakia".split(";")); this.knownCountries.add("si;Slovenia".split(";")); this.knownCountries.add("sb;Solomon Islands".split(";"));

1 0

[torspec/master] Clients may bootstrap from a default fallback directory mirror
by nickm＠torproject.org 27 Jan '16

27 Jan '16

commit 8ae8544ada81ce9d0e1c0216440e0b7daf8d2ded Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon Jan 25 10:49:34 2016 +1100 Clients may bootstrap from a default fallback directory mirror Update the directory spec to describe client behaviour with default fallback directory mirrors after #15775 and #4483. --- dir-spec.txt | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 66b3421..a61f02c 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2941,15 +2941,22 @@ Each client maintains a list of directory authorities. Insofar as possible, clients SHOULD all use the same list. + [Newer versions of Tor (0.2.8.1-alpha and later): + Each client also maintains a list of default fallback directory mirrors + (fallbacks). Each released version of Tor MAY have a different list, + depending on the mirrors that satisfy the fallback directory criteria at + release time.] + Clients try to have a live consensus network-status document at all times. A network-status document is "live" if the time in its valid-until field has not passed. When a client has no consensus network-status document, it downloads it - from a randomly chosen authority. In all other cases, the client - downloads from caches randomly chosen from among those believed to be V3 - directory servers. (This information comes from the network-status - documents; see 6 below.) + from a randomly chosen fallback directory mirror or authority. Clients + prefer fallbacks to authorities, trying them earlier and more frequently. + In all other cases, the client downloads from caches randomly chosen from + among those believed to be V3 directory servers. (This information comes + from the network-status documents; see 6 below.) After receiving any response client MUST discard any network-status documents that it did not request. @@ -2977,8 +2984,9 @@ (Note: clients can and should pick caches based on the network-status information they have: once they have first fetched network-status info - from an authority, they should not need to go to the authority directly - again.) + from an authority or fallback, they should not need to go to the authority + directly again, and should only choose the fallback at random, based on its + consensus weight in the current consensus.) To avoid swarming the caches whenever a consensus expires, the clients download new consensuses at a randomly chosen time after the

1 0

[torspec/master] Fix a typo in the directory spec where cache was used instead of client
by nickm＠torproject.org 27 Jan '16

27 Jan '16

commit 3181c504713c2e7c64b2b4b0bf2c966c7d296d1a Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon Jan 25 10:51:05 2016 +1100 Fix a typo in the directory spec where cache was used instead of client --- dir-spec.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index a61f02c..2ab1878 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2996,8 +2996,8 @@ consensus is no longer fresh, and 7/8 of the time remaining after that before the consensus is invalid.) - [For example, if a cache has a consensus that became valid at 1:00, - and is fresh until 2:00, and expires at 4:00, that cache will fetch + [For example, if a client has a consensus that became valid at 1:00, + and is fresh until 2:00, and expires at 4:00, that client will fetch a new consensus at a random time between 2:45 and 3:50, since 3/4 of the one-hour interval is 45 minutes, and 7/8 of the remaining 75 minutes is 65 minutes.]

1 0

[tor/master] Correct grammatical errors in tor comments
by nickm＠torproject.org 27 Jan '16

27 Jan '16

commit c927b6cb1aff4588a5f3729f8cc919ef3616d73e Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Tue Jan 26 13:45:01 2016 +1100 Correct grammatical errors in tor comments Avoid using gender for things that don't have it. Avoid assigning a gender to tor users. --- src/or/circuituse.c | 2 +- src/or/config.c | 2 +- src/or/connection.c | 2 +- src/or/connection_or.c | 4 ++-- src/or/directory.c | 2 +- src/or/entrynodes.c | 2 +- src/or/ext_orport.c | 2 +- src/or/relay.c | 2 +- src/or/transports.c | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index e742a56..a6fffdf 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -2241,7 +2241,7 @@ consider_recording_trackhost(const entry_connection_t *conn, char fp[HEX_DIGEST_LEN+1]; /* Search the addressmap for this conn's destination. */ - /* If he's not in the address map.. */ + /* If they're not in the address map.. */ if (!options->TrackHostExits || addressmap_have_mapping(conn->socks_request->address, options->TrackHostExitsExpire)) diff --git a/src/or/config.c b/src/or/config.c index 8ee1634..d2d8815 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1517,7 +1517,7 @@ options_act(const or_options_t *old_options) #endif /* If we are a bridge with a pluggable transport proxy but no - Extended ORPort, inform the user that she is missing out. */ + Extended ORPort, inform the user that they are missing out. */ if (server_mode(options) && options->ServerTransportPlugin && !options->ExtORPort_lines) { log_notice(LD_CONFIG, "We use pluggable transports but the Extended " diff --git a/src/or/connection.c b/src/or/connection.c index c003104..efe804d 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1440,7 +1440,7 @@ connection_handle_listener_read(connection_t *conn, int new_type) if (!SOCKET_OK(news)) { /* accept() error */ int e = tor_socket_errno(conn->s); if (ERRNO_IS_ACCEPT_EAGAIN(e)) { - return 0; /* he hung up before we could accept(). that's fine. */ + return 0; /* they hung up before we could accept(). that's fine. */ } else if (ERRNO_IS_RESOURCE_LIMIT(e)) { warn_too_many_conns(); return 0; diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 73e4d19..d778eb3 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1581,7 +1581,7 @@ connection_or_nonopen_was_started_here(or_connection_t *conn) } /** Conn just completed its handshake. Return 0 if all is well, and - * return -1 if he is lying, broken, or otherwise something is wrong. + * return -1 if they are lying, broken, or otherwise something is wrong. * * If we initiated this connection (started_here is true), make sure * the other side sent a correctly formed certificate. If I initiated the @@ -1754,7 +1754,7 @@ connection_or_client_used(or_connection_t *conn) * * Make sure we are happy with the person we just handshaked with. * - * If he initiated the connection, make sure he's not already connected, + * If they initiated the connection, make sure they're not already connected, * then initialize conn from the information in router. * * If all is successful, call circuit_n_conn_done() to handle events diff --git a/src/or/directory.c b/src/or/directory.c index e1bdcb0..c1fa37f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -715,7 +715,7 @@ connection_dir_request_failed(dir_connection_t *conn) return; /* this was a test fetch. don't retry. */ } if (!entry_list_is_constrained(get_options())) - router_set_status(conn->identity_digest, 0); /* don't try him again */ + router_set_status(conn->identity_digest, 0); /* don't try this one again */ if (conn->base_.purpose == DIR_PURPOSE_FETCH_SERVERDESC || conn->base_.purpose == DIR_PURPOSE_FETCH_EXTRAINFO) { log_info(LD_DIR, "Giving up on serverdesc/extrainfo fetch from " diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index bf71fc3..789c53d 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1152,7 +1152,7 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, } else { /* Try to have at least 2 choices available. This way we don't * get stuck with a single live-but-crummy entry and just keep - * using him. + * using it. * (We might get 2 live-but-crummy entry guards, but so be it.) */ preferred_min = 2; } diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c index f159f7d..810fa0d 100644 --- a/src/or/ext_orport.c +++ b/src/or/ext_orport.c @@ -151,7 +151,7 @@ init_ext_or_cookie_authentication(int is_enabled) } /** Read data from conn and see if the client sent us the - * authentication type that she prefers to use in this session. + * authentication type that they prefer to use in this session. * * Return -1 if we received corrupted data or if we don't support the * authentication type. Return 0 if we need more data in diff --git a/src/or/relay.c b/src/or/relay.c index ee2f041..aea51a1 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -833,7 +833,7 @@ connection_ap_process_end_not_open( } } } - /* check if he *ought* to have allowed it */ + /* check if the exit *ought* to have allowed it */ adjust_exit_policy_from_exitpolicy_failure(circ, conn, diff --git a/src/or/transports.c b/src/or/transports.c index 81b8db2..5a3af85 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -1100,7 +1100,7 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) smartlist_add(mp->transports, transport); - /* For now, notify the user so that he knows where the server + /* For now, notify the user so that they know where the server transport is listening. */ log_info(LD_CONFIG, "Server transport %s at %s:%d.", method_name, address, (int)port);

1 0