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

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 28 Jun '14

28 Jun '14

commit 2c93c085a873679a3e5c9c7d9c69a0b2ef6118b7 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 28 15:45:15 2014 +0000 Update translations for torcheck --- cs/torcheck.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cs/torcheck.po b/cs/torcheck.po index 06289b1..2565935 100644 --- a/cs/torcheck.po +++ b/cs/torcheck.po @@ -3,13 +3,14 @@ # # Translators: # czextrem <a4060001(a)jnxjn.com>, 2011 -# Radog <inactive+Radog(a)transifex.com>, 2013 +# mxsedlacek, 2014 +# Radek Bensch <inactive+Radog(a)transifex.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 08:21+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-06-28 15:43+0000\n" +"Last-Translator: mxsedlacek\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -86,13 +87,13 @@ msgid "Tor Q&A Site" msgstr "" msgid "Volunteer" -msgstr "" +msgstr "Dobrovolník" msgid "JavaScript is enabled." -msgstr "" +msgstr "JavaScript je zapnutý." msgid "JavaScript is disabled." -msgstr "" +msgstr "JavaScript je vypnutý." msgid "However, it does not appear to be the Tor Browser Bundle." msgstr ""

1 0

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

28 Jun '14

commit 0cdbc1f1297ec67bcabd73ba2e9a223a8cb7ab9f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 28 15:45:02 2014 +0000 Update translations for bridgedb --- cs/LC_MESSAGES/bridgedb.po | 153 ++++++++++++++++++++++++++------------------ 1 file changed, 89 insertions(+), 64 deletions(-) diff --git a/cs/LC_MESSAGES/bridgedb.po b/cs/LC_MESSAGES/bridgedb.po index 2dd6816..a408b8f 100644 --- a/cs/LC_MESSAGES/bridgedb.po +++ b/cs/LC_MESSAGES/bridgedb.po @@ -3,17 +3,18 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: -# adamse <adamslovacek(a)gmail.com>, 2013 +# Adam Slovacek <adamslovacek(a)gmail.com>, 2013 # Elisa <valhalla(a)gishpuppy.com>, 2011 # Sanky <gsanky+transifex(a)gmail.com>, 2011 -# Radog <inactive+Radog(a)transifex.com>, 2013 +# mxsedlacek, 2014 +# Radek Bensch <inactive+Radog(a)transifex.com>, 2013 msgid "" 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: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-17 14:36+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-06-06 21:46+0000\n" +"PO-Revision-Date: 2014-06-28 15:42+0000\n" +"Last-Translator: mxsedlacek\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,19 +25,16 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): -#. "bridge" -#. "bridges" #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" #. "obfs2" #. "obfs3" #. "scramblesuit" -#. "fte" +#. "fteproxy" #. "Tor" #. "Tor Browser" -#. "TBB" -#: lib/bridgedb/HTTPServer.py:124 +#: lib/bridgedb/HTTPServer.py:121 msgid "Sorry! Something went wrong with your request." msgstr "" @@ -60,39 +58,44 @@ msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "" -#: lib/bridgedb/strings.py:27 +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" -msgstr "" +msgstr "Vítejte v BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:29 +#: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" -msgstr "" +msgstr "V současnosti podporované transport TYPEs:" -#: lib/bridgedb/strings.py:30 +#: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" -msgstr "" +msgstr "Hey, %s!" -#: lib/bridgedb/strings.py:31 +#: lib/bridgedb/strings.py:32 msgid "Hello, friend!" -msgstr "" +msgstr "Ahoj, příteli!" -#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" -msgstr "" +msgstr "Veřejné klíče" #. 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:36 +#: lib/bridgedb/strings.py:37 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." msgstr "" -#: lib/bridgedb/strings.py:42 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. 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 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -102,14 +105,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:48 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" msgstr "" -#: lib/bridgedb/strings.py:52 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. 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 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -118,20 +127,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:65 +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "Co jsou mosty?" -#: lib/bridgedb/strings.py:66 +#: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:71 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "Chci mosty zjistit jiným způsobem!" -#: lib/bridgedb/strings.py:72 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -139,75 +148,83 @@ msgid "" "%s or %s." msgstr "" -#: lib/bridgedb/strings.py:79 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "Mé mosty nefungují. Potřebuji pomoc!" -#: lib/bridgedb/strings.py:80 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "" -#: lib/bridgedb/strings.py:81 +#. 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 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:88 +#: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:89 +#: lib/bridgedb/strings.py:104 msgid "Get Bridges!" msgstr "" -#: lib/bridgedb/strings.py:93 +#: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" msgstr "" -#: lib/bridgedb/strings.py:94 +#: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" -msgstr "" +msgstr "Potřebujete IPv6 adresu?" -#: lib/bridgedb/strings.py:95 +#: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" -msgstr "" +msgstr "Potřebujete %s?" -#: lib/bridgedb/strings.py:99 +#: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." -msgstr "" +msgstr "Váš prohlížeč nezobrazuje obrázky správně." -#: lib/bridgedb/strings.py:100 +#: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:104 +#: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" msgstr "" -#: lib/bridgedb/strings.py:105 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 #, python-format msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." msgstr "" -#: lib/bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "" -#: lib/bridgedb/strings.py:111 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "" -#: lib/bridgedb/strings.py:114 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 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" @@ -215,24 +232,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:122 +#: lib/bridgedb/strings.py:141 msgid "Displays this message." msgstr "" -#: lib/bridgedb/strings.py:123 +#. 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:145 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:124 +#: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:126 +#: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." msgstr "" -#: lib/bridgedb/strings.py:127 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" @@ -242,25 +264,29 @@ msgstr "Nahlásit chybu" #: lib/bridgedb/templates/base.html:93 msgid "Source Code" -msgstr "" +msgstr "Zdrojový kód" #: lib/bridgedb/templates/base.html:96 msgid "Changelog" -msgstr "" +msgstr "Seznam změn" #: lib/bridgedb/templates/base.html:98 msgid "Contact" -msgstr "" +msgstr "Kontakt" -#: lib/bridgedb/templates/bridges.html:65 +#. 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:66 msgid "Uh oh, spaghettios!" msgstr "" -#: lib/bridgedb/templates/bridges.html:70 +#: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." msgstr "" -#: lib/bridgedb/templates/bridges.html:71 +#: lib/bridgedb/templates/bridges.html:73 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -301,28 +327,27 @@ msgstr "" #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#. TRANSLATORS: Please do NOT translate the word "bridges"! -#: lib/bridgedb/templates/options.html:39 +#: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" msgstr "" -#: lib/bridgedb/templates/options.html:53 +#: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" msgstr "" -#: lib/bridgedb/templates/options.html:89 +#: lib/bridgedb/templates/options.html:88 msgid "No" msgstr "Ne" -#: lib/bridgedb/templates/options.html:90 +#: 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:131 +#: lib/bridgedb/templates/options.html:130 #, python-format msgid "%sY%ses!" msgstr "" @@ -330,7 +355,7 @@ msgstr "" #. 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:155 +#: lib/bridgedb/templates/options.html:154 #, python-format msgid "%sG%set Bridges" msgstr ""

1 0

[metrics-db/master] Add CC0 no copyright declaration from metrics.
by karsten＠torproject.org 28 Jun '14

28 Jun '14

commit 53fe69a800917e161a24615e49e65dedda880745 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Jun 28 09:16:16 2014 +0200 Add CC0 no copyright declaration from metrics. --- web/css/style.css | 2 ++ web/formats.html | 8 ++++++++ web/index.html | 8 ++++++++ 3 files changed, 18 insertions(+) diff --git a/web/css/style.css b/web/css/style.css index 344d8e6..ce94405 100644 --- a/web/css/style.css +++ b/web/css/style.css @@ -10,4 +10,6 @@ a[name] { padding: 0; margin: 0; } .box h2 a { visibility: hidden; } .box:hover h2 a { visibility: visible; } h3 .type-annotation { float: right; color: #666; } +div.footer { font-size: 0.8em; margin-top: 0.5cm; margin-left: 1em; + margin-right: 1em; text-align: center; } diff --git a/web/formats.html b/web/formats.html index 92427c5..9b8ba5c 100644 --- a/web/formats.html +++ b/web/formats.html @@ -556,6 +556,14 @@ directory which do not change once they are written. </div>  +<div class="footer"> +<p>Data on this site is freely available under a +<a href="http://creativecommons.org/publicdomain/zero/1.0/">CC0 no +copyright declaration</a>: To the extent possible under law, the Tor +Project has waived all copyright and related or neighboring rights in the +data.</p> +</div> + </body> </html> diff --git a/web/index.html b/web/index.html index 5cceee9..af8fce8 100644 --- a/web/index.html +++ b/web/index.html @@ -183,6 +183,14 @@ Of course, suggestions or other feedback are welcome, too. </div> +<div class="footer"> +<p>Data on this site is freely available under a +<a href="http://creativecommons.org/publicdomain/zero/1.0/">CC0 no +copyright declaration</a>: To the extent possible under law, the Tor +Project has waived all copyright and related or neighboring rights in the +data.</p> +</div> + </body> </html>

1 0

[onionoo/master] Add challenger to list of Onionoo clients.
by karsten＠torproject.org 28 Jun '14

28 Jun '14

commit 872a14b63a8cdf139bdbdb8e59114874c8dbd5a0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Jun 28 09:24:56 2014 +0200 Add challenger to list of Onionoo clients. --- web/index.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/index.html b/web/index.html index aef034a..15509e2 100644 --- a/web/index.html +++ b/web/index.html @@ -47,6 +47,10 @@ graphs.</li> WordPress plugin which draws 3 day traffic charts using pChart currently used for displaying metric charts on <a href="http://icetor.is/wordpress/metrics/">icetor.is</a>.</li> +<li><a href="https://github.com/kloesing/challenger">challenger</a> +aggregates graph data from relays participating in +<a href="https://www.eff.org/torchallenge/">EFF's 2014 Tor Challenge</a> +to provide statistics like total bytes transferred.</li> </ul> <p>The following Onionoo client is currently unmaintained, but is

1 0

r26851: {website} update board members. (website/trunk/about/en)
by Andrew Lewman 27 Jun '14

27 Jun '14

Author: phobos Date: 2014-06-27 21:52:28 +0000 (Fri, 27 Jun 2014) New Revision: 26851 Modified: website/trunk/about/en/board.wml Log: update board members. Modified: website/trunk/about/en/board.wml =================================================================== --- website/trunk/about/en/board.wml 2014-06-26 23:40:50 UTC (rev 26850) +++ website/trunk/about/en/board.wml 2014-06-27 21:52:28 UTC (rev 26851) @@ -54,18 +54,6 @@ </tr> <tr> <td> - <div class="name">Frank Rieger</div> - <div class="caps">Director</div> - <p>CTO of <a href="http://www.cryptophone.de/">GSMK Cryptophone</a>.</p> - </td> - <td class="beige"> - <div class="name">Wendy Seltzer</div> - <div class="caps">Director</div> - <p>Lawyer, cyberlaw professor, and founder of <a href="http://chillingeffects.org/">ChillingEffects.org</a>.</p> - </td> - </tr> - <tr> - <td class="beige"> <div class="name">Caspar Bowden</div> <div class="caps">Director</div> <p>An independent advocate for information self-determination @@ -74,6 +62,11 @@ EU and US surveillance law, PET research, identity management, and information ethics and philosophy.</p> </td> + <td class="beige"> + <div class="name">Wendy Seltzer</div> + <div class="caps">Director</div> + <p>Lawyer, cyberlaw professor, and founder of <a href="http://chillingeffects.org/">ChillingEffects.org</a>.</p> + </td> </tr> </table>

1 0

[obfs-flash/master] fix incorrect transport name in obfs3_flashproxy, which was causing flashproxy registration to fail
by infinity0＠torproject.org 27 Jun '14

27 Jun '14

commit 83ffac02803b5f354f02edbe122e8df515fdf756 Author: Ximin Luo <infinity0(a)torproject.org> Date: Fri Jun 27 17:42:56 2014 +0100 fix incorrect transport name in obfs3_flashproxy, which was causing flashproxy registration to fail --- obfs-flash-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obfs-flash-client b/obfs-flash-client index 7fae6b8..34f01d7 100755 --- a/obfs-flash-client +++ b/obfs-flash-client @@ -410,7 +410,7 @@ def obfs3_flashproxy(reactor, client, callback_port, fp_remote, fp_args=[], fp_l ob_client = os.getenv("OBFSPROXY", "obfsproxy") fp_client = os.getenv("FLASHPROXY_CLIENT", "flashproxy-client") - fp_cmdline = [fp_client, "--transport", '"obfs3|websocket"'] + fp_args + ['127.0.0.1:%s' % fp_local, fp_remote] + fp_cmdline = [fp_client, "--transport", 'obfs3|websocket'] + fp_args + ['127.0.0.1:%s' % fp_local, fp_remote] obfs_cmd_line = [ob_client, "managed"] transport_map = {'obfs3': obfs_cmd_line, 'flashproxy': fp_cmdline}

1 0

[obfs-flash/master] fix chaining logic
by infinity0＠torproject.org 27 Jun '14

27 Jun '14

commit 068356526078a876df301a797fabb3573630cd43 Author: Ximin Luo <infinity0(a)torproject.org> Date: Fri Jun 27 18:07:32 2014 +0100 fix chaining logic - we actually want the second shim to listen on the callback port, not the first shim - tor socks-connects directly to the first PT, it doesn't need a tcp-to-socks shim --- obfs-flash-client | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/obfs-flash-client b/obfs-flash-client index 34f01d7..75622e6 100755 --- a/obfs-flash-client +++ b/obfs-flash-client @@ -312,17 +312,20 @@ def pt_launch_chain(reactor, client, callback_port, configuration, pt_method_nam #This TCP server forwards the data to the last pt, which then sends the data to the actual bridge address last_pt_name = pt_chain[-1] # Initialize prev_port to the first port picked by the last proxy as that's the only one we know yet. - prev_port = pt_setup_socks_proxy(last_pt_name, pt_chain, success_list, dest_address, dest_port, reactor) + listen_port = 0 if len(pt_chain) > 2 else callback_port + prev_port = pt_setup_socks_proxy(last_pt_name, pt_chain, success_list, dest_address, dest_port, reactor, listen_port) - for pt_name in reversed(pt_chain[1:-1]): - #Loops through the middle pts linking them together through SOCKS proxies, skipping the first and last pts. - prev_port = pt_setup_socks_proxy(pt_name, pt_chain, success_list, '127.0.0.1', prev_port, reactor) + if len(pt_chain) > 2: + for pt_name in reversed(pt_chain[2:-1]): + #Loops through the middle pts linking them together through SOCKS proxies, skipping the first and last pts. + prev_port = pt_setup_socks_proxy(pt_name, pt_chain, success_list, '127.0.0.1', prev_port, reactor) - # Links the first server to listen on the given callback_port and forward data from the first pt onto the next. - first_pt_name = pt_chain[0] - pt_setup_socks_proxy(first_pt_name, pt_chain, success_list, '127.0.0.1', prev_port, reactor, listen_port=callback_port) + # Links the second server to listen on the given callback_port + pt_name = pt_chain[1] + prev_port = pt_setup_socks_proxy(pt_name, pt_chain, success_list, '127.0.0.1', prev_port, reactor, listen_port=callback_port) # now report success of the overall composed PT + first_pt_name = pt_chain[0] first_methodspec = [r[1] for r in success_list if r[1].name == first_pt_name and r[1].name in pt_chain][0] client.reportMethodSuccess(pt_method_name, first_methodspec.protocol, first_methodspec.addrport) client.reportMethodsEnd()

1 0

[orbot/master] apps should only show those with internet permission
by n8fr8＠torproject.org 27 Jun '14

27 Jun '14

commit 312c6da2c7b6b7197d7bb6b5f9fcd3702db2a640 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 27 13:01:48 2014 -0400 apps should only show those with internet permission --- src/org/torproject/android/settings/AppManager.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/settings/AppManager.java b/src/org/torproject/android/settings/AppManager.java index b80fccd..f43dd6f 100644 --- a/src/org/torproject/android/settings/AppManager.java +++ b/src/org/torproject/android/settings/AppManager.java @@ -217,15 +217,13 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC } - /* - * TODO n8fr8 June 2012: adding all apps for now b/c the Internet permission concept is not really working if (!app.usesInternet()) continue; else { apps.add(app); - }*/ - apps.add(app); + } + app.setEnabled(aInfo.enabled); app.setUid(aInfo.uid);

1 0

[orbot/master] fix bug with wrong apps being transproxied (typo!)
by n8fr8＠torproject.org 27 Jun '14

27 Jun '14

commit e13d228dfc98648aafddc0062e0555571a160e19 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 27 13:02:21 2014 -0400 fix bug with wrong apps being transproxied (typo!) --- src/org/torproject/android/service/TorTransProxy.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 400b1db..bf3efbd 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -343,8 +343,6 @@ public class TorTransProxy implements TorServiceConstants { //StringBuilder script = new StringBuilder(); String srcChainName = "OUTPUT"; - - int torUid = context.getApplicationInfo().uid; //run the delete commands in a separate process as it might error out //String[] cmdExecClear = {script.toString()}; @@ -369,8 +367,8 @@ public class TorTransProxy implements TorServiceConstants { { - logMessage("enabling transproxy for app: " + tApp.getUsername() + "(" + tApp.getUid() + ")"); - + logMessage("enabling transproxy for app: " + tApp.getUsername() + " (" + tApp.getUid() + ")"); + dropAllIPv6Traffic(context, tApp.getUid()); script = new StringBuilder(); @@ -407,7 +405,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -t nat"); script.append(" -A ").append(srcChainName); script.append(" -p udp"); - script.append(" -m owner ! --uid-owner "); + script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -m udp --dport "); script.append(STANDARD_DNS_PORT); @@ -441,9 +439,12 @@ public class TorTransProxy implements TorServiceConstants { { SimpleCommand cmd = new SimpleCommand(cmdString + "|| exit"); shell.add(cmd); - logMessage(cmdString);// + "; exit=" + cmd.getExitCode() + ";output=" + cmd.getOutput()); + int exitCode = cmd.getExitCode(); + String output = cmd.getOutput(); + + logMessage(cmdString + "; exit=" + exitCode + ";output=" + output); - return cmd.getExitCode(); + return exitCode; }

1 0

[orbot/master] remove test/diag option
by n8fr8＠torproject.org 27 Jun '14

27 Jun '14

commit 7f8e9b80bec33eba45a2d787152992db0cede8a4 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 27 13:02:41 2014 -0400 remove test/diag option --- src/org/torproject/android/Orbot.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 5e6a955..83d8e42 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -397,11 +397,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } - else if (item.getItemId() == R.id.menu_diag) - { - startActivity(new Intent(getApplicationContext(), OrbotDiagnosticsActivity.class)); - - } else if (item.getItemId() == R.id.menu_about) { showAbout(); @@ -437,6 +432,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); mNotificationManager.cancelAll(); + mConnection = null; + mService = null; } catch (RemoteException e) { Log.w(TAG, e); @@ -953,11 +950,13 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } } - torStatus = newTorStatus; - + + torStatus = newTorStatus; } + + } // guess what? this start's Tor! actually no it just requests via the local ITorService to the remote TorService instance @@ -1260,7 +1259,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic protected void onDestroy() { super.onDestroy(); - unbindService(mConnection); + if (mConnection != null) + unbindService(mConnection); } public class DataCount {

1 0